Don't use Qt module names in include directives. (#727)

This simplifies migration to Qt6 where some classes moved.

This was done mostly by an ed script, although mkstyle.sh took some
hand holding.

1,$g/#include <QtCore\// s/<QtCore\/\([^>]*\)>/<\1>       /
1,$g/#include <QtGui\// s/<QtGui\/\([^>]*\)>/<\1>      /
1,$g/#include <QtNetwork\// s/<QtNetwork\/\([^>]*\)>/<\1>          /
1,$g/#include <QtWidgets\// s/<QtWidgets\/\([^>]*\)>/<\1>          /
1,$g/ *$/ s/ *$//
w
q

diff --git a/arcdist.cc b/arcdist.cc
index 06eea19285fb174f12bf671ab7a6bfa7ea5aabc4..c4663f3537d3e4715d8fb0726e5a7209f8e96d4d 100644 (file)
--- a/arcdist.cc
+++ b/arcdist.cc
@@ -24,9 +24,9 @@
 #include <cstdlib>              // for strtod
 #include <cstring>              // for strchr, strlen, strncmp, strspn
 
-#include <QtCore/QByteArray>    // for QByteArray
-#include <QtCore/QString>       // for QString
-#include <QtCore/QtGlobal>      // for foreach, qPrintable, qint64
+#include <QByteArray>           // for QByteArray
+#include <QString>              // for QString
+#include <QtGlobal>             // for foreach, qPrintable, qint64
 
 #include "defs.h"
 #include "arcdist.h"

diff --git a/arcdist.h b/arcdist.h
index b70628b364ea94693b05087a7de1646e7241f782..6c9d982f26c8d81f475e21cc513401126e5d3997 100644 (file)
--- a/arcdist.h
+++ b/arcdist.h
@@ -22,7 +22,7 @@
 #ifndef ARCDIST_H_INCLUDED_
 #define ARCDIST_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARG_NOMINMAX, ARGTYPE_BOOL, Waypoint (ptr only)
 #include "filter.h"  // for Filter

diff --git a/bcr.cc b/bcr.cc
index 411577b75f2161745457c7c7c9e8171fdd46019d..1954ced342e1e7588a3c0c51b313e1b2e1009d6b 100644 (file)
--- a/bcr.cc
+++ b/bcr.cc
@@ -30,9 +30,9 @@
 #include <cstdio>           // for printf, snprintf, sscanf
 #include <cstdlib>          // for atof, atoi
 
-#include <QtCore/QString>   // for QString, operator+
-#include <QtCore/Qt>        // for CaseInsensitive
-#include <QtCore/QtGlobal>  // for foreach
+#include <QString>          // for QString, operator+
+#include <Qt>               // for CaseInsensitive
+#include <QtGlobal>         // for foreach
 
 #include "defs.h"
 #include "csv_util.h"       // for csv_stringclean

diff --git a/bend.cc b/bend.cc
index 0001ea991f0031595d659ac152a0a6f736c63403..1bfb7060e2a2ac243547345d535f99ddb142cb07 100644 (file)
--- a/bend.cc
+++ b/bend.cc
@@ -23,8 +23,8 @@
 #include <cmath>            // macos wants abs from here!
 #include <cstdlib>          // for strtod, abs
 
-#include <QtCore/QString>   // for QString
-#include <QtCore/QtGlobal>  // for qAsConst, QAddConst<>::Type, foreach
+#include <QString>          // for QString
+#include <QtGlobal>         // for qAsConst, QAddConst<>::Type, foreach
 
 #include "defs.h"
 #include "bend.h"

diff --git a/bend.h b/bend.h
index ef55ddeb8b86d67db1e1c669a003b8cf1a493658..a87d8c758d4e9da805cff2978920f7ddf803bd9f 100644 (file)
--- a/bend.h
+++ b/bend.h
@@ -23,7 +23,7 @@
 #ifndef BEND_H_INCLUDED_
 #define BEND_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for route_head (ptr only), ARGTYPE_FLOAT, ARG_NOMINMAX
 #include "filter.h"  // for Filter

diff --git a/cet_util.cc b/cet_util.cc
index 62bb3d2691d3212c84acceff87a2aa79e1c1908e..b3451c6b981eebddad99aad82ea02109b6f48551 100644 (file)
--- a/cet_util.cc
+++ b/cet_util.cc
@@ -19,9 +19,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <QtCore/QByteArray>     // for QByteArray
-#include <QtCore/QDebug>         // for QDebug
-#include <QtCore/QTextCodec>     // for QTextCodec
+#include <QByteArray>            // for QByteArray
+#include <QDebug>                // for QDebug
+#include <QTextCodec>            // for QTextCodec
 
 #include "defs.h"
 #include "cet_util.h"

diff --git a/cet_util.h b/cet_util.h
index 4d8c93a504ef530a20c0e47fb660655f41de42bd..cc0e4f545c9c6686b424b59331bc55a5da9fe900 100644 (file)
--- a/cet_util.h
+++ b/cet_util.h
@@ -22,7 +22,7 @@
 #ifndef CET_UTIL_H_INCLUDED_
 #define CET_UTIL_H_INCLUDED_
 
-#include <QtCore/QString>
+#include <QString>
 #include "defs.h"
 
 

diff --git a/coverity_model.cc b/coverity_model.cc
index 4f03cf103ef8862ff1741bfceda351177fa6dbec..52bb12ddf4eabdc80b94c45660d00efa37cb1cea 100644 (file)
--- a/coverity_model.cc
+++ b/coverity_model.cc
@@ -7,12 +7,12 @@ void fatal(const char *msg, ...) {
 }
 
 // Forward decls to make the signature match.
-class Waypoint; 
+class Waypoint;
 class route_head;
 class QString;
 class route;
 
-// These functions "claim" their arguments 
+// These functions "claim" their arguments
 void
 waypt_add(Waypoint* wpt) {
   __coverity_escape__(wpt);
@@ -31,7 +31,7 @@ void route_add_wpt(route_head* rte, Waypoint* wpt) {
 void track_add_wpt(route_head* rte, Waypoint* wpt) {
   __coverity_escape__(wpt);
 }
-void route_add_wpt_named(route_head* rte, Waypoint* wpt, 
+void route_add_wpt_named(route_head* rte, Waypoint* wpt,
                          const QString& namepart, int number_digits) {
   __coverity_escape__(wpt);
 }

diff --git a/csv_util.cc b/csv_util.cc
index 4743bfe63058ac6068aaaac507dc0c3a6557236c..70bad0d66ef0bc11fb08bf956fad28231596d307 100644 (file)
--- a/csv_util.cc
+++ b/csv_util.cc
@@ -26,8 +26,8 @@
 #include <cctype>          // for isspace
 #include <cstring>         // for strlen, strchr, strncmp, strcmp, memmove, strcpy, strcspn, strncpy
 
-#include <QtCore/QRegExp>  // for QRegExp
-#include <QtCore/QString>  // for QString
+#include <QRegExp>         // for QRegExp
+#include <QString>         // for QString
 
 #include "defs.h"
 #include "csv_util.h"

diff --git a/csv_util.h b/csv_util.h
index 4d7c4bf6ce39a7fda90e9b8ca5ff38bbb6de5649..3980db4ce1e86197cbb2fc1ad7de28cb8e522d19 100644 (file)
--- a/csv_util.h
+++ b/csv_util.h
@@ -21,7 +21,7 @@
 #ifndef CSV_UTIL_H_INCLUDED_
 #define CSV_UTIL_H_INCLUDED_
 
-#include <QtCore/QString>      // for QString
+#include <QString>             // for QString
 
 #include "defs.h"
 

diff --git a/defs.h b/defs.h
index cbfb06cb1289227aea3cb44a7400e0e23dd83acd..a9c43b29bf4a37b919415458c17eefdbd4826adb 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -35,14 +35,14 @@
 #include "zlib.h"                 // doesn't really belong here, but is missing elsewhere.
 #endif
 
-#include <QtCore/QDebug>          // for QDebug
-#include <QtCore/QList>           // for QList, QList<>::const_reverse_iterator, QList<>::reverse_iterator
-#include <QtCore/QScopedPointer>  // for QScopedPointer
-#include <QtCore/QString>         // for QString
-#include <QtCore/QTextCodec>      // for QTextCodec
-#include <QtCore/QVector>         // for QVector
-#include <QtCore/Qt>              // for CaseInsensitive
-#include <QtCore/QtGlobal>        // for foreach
+#include <QDebug>                 // for QDebug
+#include <QList>                  // for QList, QList<>::const_reverse_iterator, QList<>::reverse_iterator
+#include <QScopedPointer>         // for QScopedPointer
+#include <QString>                // for QString
+#include <QTextCodec>             // for QTextCodec
+#include <QVector>                // for QVector
+#include <Qt>                     // for CaseInsensitive
+#include <QtGlobal>               // for foreach
 
 #include "formspec.h"             // for FormatSpecificData
 #include "inifile.h"              // for inifile_t
@@ -742,7 +742,7 @@ public:
   void disp_all(std::nullptr_t /* rh */, std::nullptr_t /* rt */, T3 wc);
 
   // Only expose methods from our underlying container that won't corrupt our private data.
-  // Our contained element (route_head) also contains a container (waypoint_list), 
+  // Our contained element (route_head) also contains a container (waypoint_list),
   // and we maintain a total count the elements in these contained containers, i.e.
   // the total number of waypoints in all the routes in the RouteList.
   // public types

diff --git a/destinator.cc b/destinator.cc
index 27d1f175e88bb38584a3560db8ba625db0246250..8f14a28a2cca7bb09dc1f8df23b8fa55b69a26d7 100644 (file)
--- a/destinator.cc
+++ b/destinator.cc
@@ -21,7 +21,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
  */
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include <cassert>                 // for assert
 #include <cmath>                   // for fabs, lround
@@ -30,14 +30,14 @@
 #include <cstring>                 // for strcmp, memmove, memset, strlen
 #include <ctime>                   // for gmtime
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QScopedPointer>   // for QScopedPointer
-#include <QtCore/QString>          // for QString
-#include <QtCore/QTextCodec>       // for QTextCodec, QTextCodec::IgnoreHeader
-#include <QtCore/QTextDecoder>     // for QTextDecoder
-#include <QtCore/QTextEncoder>     // for QTextEncoder
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/QVector>          // for QVector
+#include <QByteArray>              // for QByteArray
+#include <QScopedPointer>          // for QScopedPointer
+#include <QString>                 // for QString
+#include <QTextCodec>              // for QTextCodec, QTextCodec::IgnoreHeader
+#include <QTextDecoder>            // for QTextDecoder
+#include <QTextEncoder>            // for QTextEncoder
+#include <QTime>                   // for QTime
+#include <QVector>                 // for QVector
 
 #include "defs.h"
 #include "garmin_fs.h"             // for garmin_fs_t, garmin_fs_flags_t, GMSD_GET, GMSD_SETSTRQ, garmin_fs_alloc, GMSD_FIND
@@ -109,7 +109,7 @@ read_until_wcstr(const QString& str)
   QScopedPointer<QTextEncoder> encoder(utf16le_codec->makeEncoder(QTextCodec::IgnoreHeader));
   QByteArray target = encoder->fromUnicode(str).append(2, 0);
   assert((target.size() % 2) == 0);
-  
+
   int eos = 0;
 
   int sz = target.size();

diff --git a/dg-100.cc b/dg-100.cc
index e452997c0e31b72df210664b7e7e8a78a42aad93..e43f1e33bb8fe9889c6239ae395f19874b1599cc 100644 (file)
--- a/dg-100.cc
+++ b/dg-100.cc
@@ -36,15 +36,15 @@
 #include <cstdlib>                     // for abs
 #include <cstring>                     // for memcpy, memcmp, strcmp
 
-#include <QtCore/QByteArray>           // for QByteArray
-#include <QtCore/QDate>                // for QDate
-#include <QtCore/QDateTime>            // for QDateTime
-#include <QtCore/QList>                // for QList
-#include <QtCore/QScopedArrayPointer>  // for QScopedArrayPointer
-#include <QtCore/QString>              // for QString
-#include <QtCore/QTime>                // for QTime
-#include <QtCore/Qt>                   // for TextDate, UTC
-#include <QtCore/QtGlobal>             // for qPrintable
+#include <QByteArray>                  // for QByteArray
+#include <QDate>                       // for QDate
+#include <QDateTime>                   // for QDateTime
+#include <QList>                       // for QList
+#include <QScopedArrayPointer>         // for QScopedArrayPointer
+#include <QString>                     // for QString
+#include <QTime>                       // for QTime
+#include <Qt>                          // for TextDate, UTC
+#include <QtGlobal>                    // for qPrintable
 
 #include "defs.h"
 #include "dg-100.h"

diff --git a/dg-100.h b/dg-100.h
index 9e09db46ec7e91dcd9218d666e21809384568c38..7d471477dfefdce51c37e8a5354c770a0f8497c0 100644 (file)
--- a/dg-100.h
+++ b/dg-100.h
@@ -33,10 +33,10 @@
 #include <cstdint>           // for uint8_t, int16_t, uint16_t
 #include <cstdio>            // for size_t
 
-#include <QtCore/QDateTime>  // for QDateTime
-#include <QtCore/QList>      // for QList
-#include <QtCore/QString>    // for QString
-#include <QtCore/QVector>    // for QVector
+#include <QDateTime>         // for QDateTime
+#include <QList>             // for QList
+#include <QString>           // for QString
+#include <QVector>           // for QVector
 
 #include "defs.h"
 #include "format.h"          // for Format

diff --git a/discard.cc b/discard.cc
index d23a80e2e05fe338131cb779e34663146acd7b9b..a052e3663225ad1638a85923dcdece07acb28bb4 100644 (file)
--- a/discard.cc
+++ b/discard.cc
@@ -23,7 +23,7 @@
 #include "discard.h"
 #include <cstdlib>
 // Can't use QRegularExpression because Linux won't get Qt 5 for years.
-#include <QtCore/QRegExp>
+#include <QRegExp>
 #include <cstdio>
 #include <cstdlib>
 

diff --git a/discard.h b/discard.h
index fd6b369cb18d09f6b9d9d7dc4fe385be159c44a9..1dbb234f8af695b1df2fde378392fe2d29958834 100644 (file)
--- a/discard.h
+++ b/discard.h
@@ -23,8 +23,8 @@
 #define DISCARD_H_INCLUDED_
 
 // Can't use QRegularExpression because Linux won't get Qt 5 for years.
-#include <QtCore/QRegExp>  // for QRegExp
-#include <QtCore/QVector>  // for QVector
+#include <QRegExp>         // for QRegExp
+#include <QVector>         // for QVector
 
 #include "defs.h"          // for ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_S...
 #include "filter.h"        // for Filter

diff --git a/dmtlog.cc b/dmtlog.cc
index 7c338d5b07f5baac6e0eb22568b29b9e2479f7b0..37cbbf5744b99417dd6e809272d5febc717a38ee 100644 (file)
--- a/dmtlog.cc
+++ b/dmtlog.cc
@@ -25,10 +25,10 @@
 #include <cstdlib>                      // for atoi
 #include <cstring>                      // for strncmp, memcpy, strcmp, strlen
 
-#include <QtCore/QByteArray>            // for QByteArray
-#include <QtCore/QString>               // for QString, operator+
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/QtGlobal>              // for qPrintable
+#include <QByteArray>                   // for QByteArray
+#include <QString>                      // for QString, operator+
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <QtGlobal>                     // for qPrintable
 
 #include "defs.h"
 #include "gbfile.h"                     // for gbfgetdbl, gbfgetint32, gbfputint32, gbfgetint16, gbfputdbl, gbfputc, gbfread, gbfseek, gbfgetc, gbfile, gbfclose, gbfungetc, gbfeof, gbfputs, gbfwrite, gbfopen_le, gbfgetuint32, gbfputuint16, gbfputuint32
@@ -707,7 +707,7 @@ write_header(const route_head* trk)
     write_str(trk->rte_name, fout);
   }
 
-  // This fails for internationalization, but as this text is in the 
+  // This fails for internationalization, but as this text is in the
   // file itself, it shouldn't be localized.
   QString cout = QString::number(count) + " trackpoints and " +
                  QString::number(waypt_count()) + " waypoints";

diff --git a/duplicate.cc b/duplicate.cc
index 7d0cd83043e0cdb0d5afe99773db92dffe7b77d4..2cd880fda1ff021219ff4844710cfaeb42a8a13f 100644 (file)
--- a/duplicate.cc
+++ b/duplicate.cc
@@ -23,8 +23,8 @@
 #include <cstdlib>              // for qsort
 #include <cstring>              // for memset, strncpy
 
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QtGlobal>      // for foreach
+#include <QDateTime>            // for QDateTime
+#include <QtGlobal>             // for foreach
 
 #include "defs.h"
 #include "duplicate.h"

diff --git a/duplicate.h b/duplicate.h
index 1cce5102915d6d3e3300b06ed257d2fb766be90c..087482193a1082ad5289b4635df936b1338e52bb 100644 (file)
--- a/duplicate.h
+++ b/duplicate.h
@@ -22,7 +22,7 @@
 #ifndef DUPLICATE_H_INCLUDED_
 #define DUPLICATE_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, Waypoint (ptr only)
 #include "filter.h"  // for Filter

diff --git a/energympro.cc b/energympro.cc
index 67391b17f1ae40573018cf8c533fb9f6316af7f0..b085e87a5f863177672174e9ec7ca3547daa8fb9 100644 (file)
--- a/energympro.cc
+++ b/energympro.cc
@@ -23,13 +23,13 @@
 #include <cstdint>              // for int32_t
 #include <cstdio>               // for printf, SEEK_SET, SEEK_CUR, SEEK_END
 
-#include <QtCore/QDate>         // for QDate
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QDebug>        // for QDebug
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/QTimeZone>     // for QTimeZone
-#include <QtCore/Qt>            // for UTC
+#include <QDate>                // for QDate
+#include <QDateTime>            // for QDateTime
+#include <QDebug>               // for QDebug
+#include <QString>              // for QString
+#include <QTime>                // for QTime
+#include <QTimeZone>            // for QTimeZone
+#include <Qt>                   // for UTC
 
 #include "defs.h"
 #include "energympro.h"

diff --git a/energympro.h b/energympro.h
index d5e9a59964ff64f2d818f5cf672f4cb88aa1c926..fa0e868e192b425eff5c1367f7fca2ae03711d5d 100644 (file)
--- a/energympro.h
+++ b/energympro.h
@@ -24,9 +24,9 @@
 
 #include <cstdint>              // for uint8_t, uint16_t, uint32_t, int16_t
 
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTimeZone>     // for QTimeZone
-#include <QtCore/QVector>       // for QVector
+#include <QString>              // for QString
+#include <QTimeZone>            // for QTimeZone
+#include <QVector>              // for QVector
 
 #include "defs.h"
 #include "format.h"             // for Format

diff --git a/enigma.cc b/enigma.cc
index 32fea92d646414b402395e39b1b043acadacb625..32b2707e65e5d6e0181aee8d4af0ee637aa8dec9 100644 (file)
--- a/enigma.cc
+++ b/enigma.cc
@@ -26,7 +26,7 @@
 #include <cstdlib>         // for abs
 #include <cstring>         // for strlen, memcpy, memset
 
-#include <QtCore/QString>  // for QString
+#include <QString>         // for QString
 
 #include "defs.h"
 #include "gbfile.h"        // for gbfclose, gbfopen_le, gbfread, gbfwrite, gbfile

diff --git a/exif.cc b/exif.cc
index 9957938a95ff3a5dcb02013c921f2aa4a732058b..a2e217efb0b5e4b6709a0088fe8acbd51579e870 100644 (file)
--- a/exif.cc
+++ b/exif.cc
@@ -40,22 +40,22 @@
 #include "jeeps/gpsmath.h"                 // for GPS_Math_WGS84_To_Known_Datum_M
 #include "src/core/datetime.h"             // for DateTime
 
-#include <QtCore/QByteArray>               // for QByteArray
-#include <QtCore/QDate>                    // for QDate
-#include <QtCore/QDateTime>                // for QDateTime
-#include <QtCore/QFile>                    // for QFile
-#include <QtCore/QFileInfo>                // for QFileInfo
-#include <QtCore/QList>                    // for QList<>::iterator, QList
-#include <QtCore/QPair>                    // for QPair
-#include <QtCore/QRegularExpression>       // for QRegularExpression
-#include <QtCore/QRegularExpressionMatch>  // for QRegularExpressionMatch
-#include <QtCore/QString>                  // for QString
-#include <QtCore/QTextCodec>               // for QTextCodec
-#include <QtCore/QTime>                    // for QTime
-#include <QtCore/QVariant>                 // for QVariant
-#include <QtCore/QVector>                  // for QVector
-#include <QtCore/Qt>                       // for UTC, ISODate
-#include <QtCore/QtGlobal>                 // for qSwap, qPrintable, qint64
+#include <QByteArray>                      // for QByteArray
+#include <QDate>                           // for QDate
+#include <QDateTime>                       // for QDateTime
+#include <QFile>                           // for QFile
+#include <QFileInfo>                       // for QFileInfo
+#include <QList>                           // for QList<>::iterator, QList
+#include <QPair>                           // for QPair
+#include <QRegularExpression>              // for QRegularExpression
+#include <QRegularExpressionMatch>         // for QRegularExpressionMatch
+#include <QString>                         // for QString
+#include <QTextCodec>                      // for QTextCodec
+#include <QTime>                           // for QTime
+#include <QVariant>                        // for QVariant
+#include <QVector>                         // for QVector
+#include <Qt>                              // for UTC, ISODate
+#include <QtGlobal>                        // for qSwap, qPrintable, qint64
 
 #include <algorithm>                       // for sort, min
 #include <cassert>                         // for assert

diff --git a/f90g_track.cc b/f90g_track.cc
index a949f471354465018e4360d04db7614a9d92d41b..77e50a5e7351c87aec49e80e7e272c9e414d4d7f 100644 (file)
--- a/f90g_track.cc
+++ b/f90g_track.cc
@@ -28,8 +28,8 @@
 
 #include "defs.h"
 #include "gbfile.h"
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
+#include <QDebug>
+#include <QFileInfo>
 
 #define MYNAME "f90g_track"
 #define TTRECORDSIZE      249

diff --git a/filter_vecs.cc b/filter_vecs.cc
index 2f42409f1914b2d900c6bb8030f4e36d7e75ca4b..a8973e7dd120f41a6a99f809c2b0689c57faa38f 100644 (file)
--- a/filter_vecs.cc
+++ b/filter_vecs.cc
@@ -19,12 +19,12 @@
 
  */
 
-#include <QtCore/QByteArray>   // for QByteArray
-#include <QtCore/QString>      // for QString
-#include <QtCore/QStringList>  // for QStringList
-#include <QtCore/QVector>      // for QVector<>::iterator, QVector
-#include <QtCore/Qt>           // for CaseInsensitive
-#include <QtCore/QtGlobal>     // for qPrintable
+#include <QByteArray>          // for QByteArray
+#include <QString>             // for QString
+#include <QStringList>         // for QStringList
+#include <QVector>             // for QVector<>::iterator, QVector
+#include <Qt>                  // for CaseInsensitive
+#include <QtGlobal>            // for qPrintable
 
 #include <algorithm>           // for sort
 #include <cassert>             // for assert

diff --git a/filter_vecs.h b/filter_vecs.h
index b3489a7bcf57337eca756d0169f5153df51f0cc1..b52bd19c85ef22c187c90503702ed1e4ff714c89 100644 (file)
--- a/filter_vecs.h
+++ b/filter_vecs.h
@@ -21,8 +21,8 @@
 #ifndef FILTER_VECS_H_INCLUDED_
 #define FILTER_VECS_H_INCLUDED_
 
-#include <QtCore/QString>      // for QString
-#include <QtCore/QVector>      // for QVector<>::iterator, QVector
+#include <QString>             // for QString
+#include <QVector>             // for QVector<>::iterator, QVector
 
 #include "defs.h"           // for arglist_t
 #include "arcdist.h"        // for ArcDistanceFilter

diff --git a/formspec.cc b/formspec.cc
index 446241a6716e1afc7dcfb5a4291840e339c9dbe1..19ed82e9b1fcc7aca92b838346bb64e307b9e543 100644 (file)
--- a/formspec.cc
+++ b/formspec.cc
@@ -19,7 +19,7 @@
 
  */
 
-#include <QtCore/QList>  // for QList
+#include <QList>         // for QList
 
 #include "defs.h"
 #include "formspec.h"    // for FormatSpecificData, FsChainAdd, FsChainCopy, FsChainDestroy, FsChainFind

diff --git a/formspec.h b/formspec.h
index 7b26655294bd0784b7d62c5ddbba46cacf989d27..e3e091d344ee3e606dac3646205a0712ddac41b5 100644 (file)
--- a/formspec.h
+++ b/formspec.h
@@ -21,7 +21,7 @@
 #ifndef FORMSPEC_H_INCLUDED_
 #define FORMSPEC_H_INCLUDED_
 
-#include <QtCore/QList>  // for QList
+#include <QList>         // for QList
 
 enum FsType {
   kFsUnknown = 0L,

diff --git a/garmin.cc b/garmin.cc
index 871626e6841aa79b5800feb9e8aef5485ee09ae6..3f207a12447efcac78b319893ddd180ebe66871d 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -28,11 +28,11 @@
 #include <cstring>              // for memcpy, strlen, strncpy, strchr
 #include <ctime>                // for time_t
 
-#include <QtCore/QByteArray>    // for QByteArray
-#include <QtCore/QChar>         // for QChar
-#include <QtCore/QString>       // for QString
-#include <QtCore/Qt>            // for CaseInsensitive
-#include <QtCore/QtGlobal>      // for qPrintable, foreach
+#include <QByteArray>           // for QByteArray
+#include <QChar>                // for QChar
+#include <QString>              // for QString
+#include <Qt>                   // for CaseInsensitive
+#include <QtGlobal>             // for qPrintable, foreach
 
 #include "defs.h"
 #include "cet_util.h"           // for cet_convert_init, cet_cs_vec_utf8
@@ -357,7 +357,7 @@ rw_deinit()
       gps_baud_rate = baud;
     }
   }
-  
+
   if (mkshort_handle) {
     mkshort_del_handle(&mkshort_handle);
   }

diff --git a/garmin_device_xml.cc b/garmin_device_xml.cc
index 4591495258797401eb60fbafe934091c2bd693f7..f880d0c969bd0c3a460f3576fc3004687e4abc0b 100644 (file)
--- a/garmin_device_xml.cc
+++ b/garmin_device_xml.cc
@@ -28,8 +28,8 @@
 #include "defs.h"
 #include "garmin_device_xml.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
-#include <QtCore/QFile>
+#include <QXmlStreamAttributes>
+#include <QFile>
 #include <cstdio>
 
 #define MYNAME "whatever"

diff --git a/garmin_fit.cc b/garmin_fit.cc
index 8022911c4ff58d0c2563fcff0650d9c3b07bd937..550f26159fdc7f570b948d196676523bcb97f5c4 100644 (file)
--- a/garmin_fit.cc
+++ b/garmin_fit.cc
@@ -30,13 +30,13 @@
 #include <utility>             // for pair
 #include <vector>              // for vector
 
-#include <QtCore/QByteArray>   // for QByteArray
-#include <QtCore/QDateTime>    // for QDateTime
-#include <QtCore/QFileInfo>    // for QFileInfo
-#include <QtCore/QLatin1Char>  // for QLatin1Char
-#include <QtCore/QString>      // for QString
-#include <QtCore/Qt>           // for CaseInsensitive
-#include <QtCore/QtGlobal>     // for qint64
+#include <QByteArray>          // for QByteArray
+#include <QDateTime>           // for QDateTime
+#include <QFileInfo>           // for QFileInfo
+#include <QLatin1Char>         // for QLatin1Char
+#include <QString>             // for QString
+#include <Qt>                  // for CaseInsensitive
+#include <QtGlobal>            // for qint64
 
 #include "defs.h"
 #include "garmin_fit.h"

diff --git a/garmin_fit.h b/garmin_fit.h
index 6fc6ab69b6da7f6395eeb8c114b6739035da5324..ccef26c599136a5f4d7c83726f1cef87b1f700e8 100644 (file)
--- a/garmin_fit.h
+++ b/garmin_fit.h
@@ -30,10 +30,10 @@
 #include <utility>              // for pair
 #include <vector>               // for vector
 
-#include <QtCore/QHash>         // for QHash
-#include <QtCore/QList>         // for QList
-#include <QtCore/QString>       // for QString
-#include <QtCore/QVector>       // for QVector
+#include <QHash>                // for QHash
+#include <QList>                // for QList
+#include <QString>              // for QString
+#include <QVector>              // for QVector
 
 #include "defs.h"
 #include "format.h"             // for Format

diff --git a/garmin_fs.cc b/garmin_fs.cc
index 9c824597047dd64e85a444850efb3e95c2e5325f..136e4ce8b682a8967c3f6b7ef42765f81cc809e2 100644 (file)
--- a/garmin_fs.cc
+++ b/garmin_fs.cc
@@ -25,11 +25,11 @@
 #include <cstdlib>                   // for atof
 #include <cstring>                   // for strncpy
 
-#include <QtCore/QByteArray>         // for QByteArray
-#include <QtCore/QStaticStringData>  // for QStaticStringData
-#include <QtCore/QString>            // for QString, QStringLiteral
-#include <QtCore/QXmlStreamWriter>   // for QXmlStreamWriter
-#include <QtCore/Qt>                 // for CaseInsensitive
+#include <QByteArray>                // for QByteArray
+#include <QStaticStringData>         // for QStaticStringData
+#include <QString>                   // for QString, QStringLiteral
+#include <QXmlStreamWriter>          // for QXmlStreamWriter
+#include <Qt>                        // for CaseInsensitive
 
 #include "defs.h"
 #include "garmin_fs.h"

diff --git a/garmin_fs.h b/garmin_fs.h
index 26f25673c04fcce9e4de400449d6879674b5520f..13e8d4039e1d9bff7e3c0e8040a26481654585e8 100644 (file)
--- a/garmin_fs.h
+++ b/garmin_fs.h
@@ -27,8 +27,8 @@
 #include <cstddef>                  // for size_t
 #include <cstdint>                  // for int32_t, int16_t, uint16_t
 
-#include <QtCore/QString>           // for QString
-#include <QtCore/QXmlStreamWriter>  // for QXmlStreamWriter
+#include <QString>                  // for QString
+#include <QXmlStreamWriter>         // for QXmlStreamWriter
 
 #include "defs.h"
 #include "formspec.h"               // for FsChainFind, kFsGmsd, FormatSpecificData

diff --git a/garmin_gpi.cc b/garmin_gpi.cc
index b6edec728ac1c8c30d6df83f505e39b3b2ddb19c..717f98c51d7317a07dcb1865a18bb85c893b91b4 100644 (file)
--- a/garmin_gpi.cc
+++ b/garmin_gpi.cc
@@ -52,14 +52,14 @@
 #include <cstring>                 // for strlen, strncmp
 #include <ctime>                   // for time, time_t, gmtime
 
-#include <QtCore/QByteArray>       // for QByteArray, operator==
-#include <QtCore/QByteRef>         // for QByteRef
-#include <QtCore/QList>            // for QList<>::iterator, QList
-#include <QtCore/QString>          // for QString, operator+, operator<
-#include <QtCore/QThread>          // for QThread
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
-#include <QtCore/QtGlobal>         // for foreach, Q_UNUSED
+#include <QByteArray>              // for QByteArray, operator==
+#include <QByteRef>                // for QByteRef
+#include <QList>                   // for QList<>::iterator, QList
+#include <QString>                 // for QString, operator+, operator<
+#include <QThread>                 // for QThread
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
+#include <QtGlobal>                // for foreach, Q_UNUSED
 
 #include "defs.h"
 #include "garmin_gpi.h"

diff --git a/garmin_tables.cc b/garmin_tables.cc
index b6f5c59b4f4d3462ee21ee616519e5e16a645594..3220f20bc05f19347b7fdf9240b80d196e82baa4 100644 (file)
--- a/garmin_tables.cc
+++ b/garmin_tables.cc
@@ -22,9 +22,9 @@
 
 #include <cstdint>               // for int32_t
 #include <cstring>               // for strncpy, strchr, strlen, strncmp
-#include <QtCore/QChar>          // for operator==, QChar
-#include <QtCore/QDebug>         // for QDebug
-#include <QtCore/Qt>             // for CaseInsensitive
+#include <QChar>                 // for operator==, QChar
+#include <QDebug>                // for QDebug
+#include <Qt>                    // for CaseInsensitive
 #include "defs.h"
 #include "garmin_tables.h"
 #include "jeeps/gpsmath.h"       // for GPS_Lookup_Datum_Index, GPS_Math_Get_Datum_Name

diff --git a/garmin_tables.h b/garmin_tables.h
index 1dbfa37d5a2f9c45c971f0475bdf122a36869ef6..47dc7b2e0a4091905edaac9fe5dcef9e728d3622 100644 (file)
--- a/garmin_tables.h
+++ b/garmin_tables.h
@@ -24,7 +24,7 @@
 #define GARMIN_TABLES_H
 
 #include <cstdint>              // for uint32_t
-#include <QtCore/QString>       // for QString
+#include <QString>              // for QString
 #include "defs.h"               // for grid_type
 
 #define DEFAULT_ICON_DESCR "Waypoint"

diff --git a/garmin_txt.cc b/garmin_txt.cc
index bf4c91f42ee82aa65aba08bef677c1038a68bf83..485bf3c9ea7bf0842f13cf8c2d893cfab8c5d32b 100644 (file)
--- a/garmin_txt.cc
+++ b/garmin_txt.cc
@@ -31,14 +31,14 @@
 #include <cstring>                 // for memset, strstr, strcat, strchr, strlen, strcmp, strcpy, strncpy
 #include <ctime>                   // for gmtime, localtime, strftime
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QChar>            // for QChar, QChar::Other_Control
-#include <QtCore/QIODevice>        // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly
-#include <QtCore/QString>          // for QString, operator!=
-#include <QtCore/QTextStream>      // for QTextStream
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
-#include <QtCore/QtGlobal>         // for qPrintable
+#include <QByteArray>              // for QByteArray
+#include <QChar>                   // for QChar, QChar::Other_Control
+#include <QIODevice>               // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly
+#include <QString>                 // for QString, operator!=
+#include <QTextStream>             // for QTextStream
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
+#include <QtGlobal>                // for qPrintable
 
 #include "csv_util.h"              // for csv_lineparse
 #include "garmin_fs.h"             // for garmin_fs_t, garmin_fs_alloc, garmin_fs_convert_category, GMSD_SECTION_CATEGORIES

diff --git a/gbfile.cc b/gbfile.cc
index a4bbfec310fa125c1989c1677ff2ab67ecbf904d..fe056dcd9a8bc8e44afee5f9674877cf6f638630 100644 (file)
--- a/gbfile.cc
+++ b/gbfile.cc
@@ -20,9 +20,9 @@
 
  */
 
-#include <QtCore/QByteArray>   // for QByteArray
-#include <QtCore/QString>      // for QString
-#include <QtCore/QtGlobal>     // for qPrintable
+#include <QByteArray>          // for QByteArray
+#include <QString>             // for QString
+#include <QtGlobal>            // for qPrintable
 
 #include <cassert>             // for assert
 #include <cctype>              // for tolower
@@ -647,7 +647,7 @@ gbfgetc(gbfile* file)
  * gbfgets: (as fgets)
  */
 
-QString 
+QString
 gbfgets(char* buf, int len, gbfile* file)
 {
   char* result = buf;
@@ -695,8 +695,8 @@ gbfread(void* buf, const gbsize_t size, const gbsize_t members, gbfile* file)
 
 // goofy) calling signature.
 gbsize_t
-gbfread(QString& buf, const gbsize_t size, 
-        const gbsize_t members, gbfile* file) 
+gbfread(QString& buf, const gbsize_t size,
+        const gbsize_t members, gbfile* file)
 {
   QByteArray tmp;
   tmp.resize(members * size);
@@ -1018,7 +1018,7 @@ gbfgetcstr(gbfile* file)
   char* result = gbfgetcstr_old(file);
   QString rv(result);
   xfree(result);
-  return rv; 
+  return rv;
 }
 
 QByteArray
@@ -1027,7 +1027,7 @@ gbfgetnativecstr(gbfile* file)
   char* result = gbfgetcstr_old(file);
   QByteArray rv(result);
   xfree(result);
-  return rv; 
+  return rv;
 }
 
 /*

diff --git a/gbfile.h b/gbfile.h
index 1a65418ef21eebcadbc434d8ca22e37793fc5e0e..2e2d0460ba476f17cc307bbc3ae94b95c44344e8 100644 (file)
--- a/gbfile.h
+++ b/gbfile.h
@@ -23,8 +23,8 @@
 #ifndef GBFILE_H
 #define GBFILE_H
 
-#include <QtCore/QByteArray>    // for QByteArray
-#include <QtCore/QString>       // for QString
+#include <QByteArray>           // for QByteArray
+#include <QString>              // for QString
 
 #include <cstdarg>             // for va_list
 #include <cstdint>             // for int32_t, int16_t, uint32_t

diff --git a/gbser_win.cc b/gbser_win.cc
index 66271cd9a87abbeb87a1d6728f0bd2b9b039efbf..f47ea88c3d0132ad491a287f3dde259385f0ed02 100644 (file)
--- a/gbser_win.cc
+++ b/gbser_win.cc
@@ -70,7 +70,7 @@ DWORD mkspeed(unsigned br)
     return CBR_115200;
   case 230400:
   // Per https://msdn.microsoft.com/en-us/library/windows/desktop/aa363214
-  // "This member can be an actual baud rate value, or one of the 
+  // "This member can be an actual baud rate value, or one of the
   // following indexes."
   // They provide a CBR_25600, which would be programmable on a 16450 only
   // with a bizarre oscillator crystal, but don't provide a 230400, such

diff --git a/gdb.cc b/gdb.cc
index c8a3314218623037dbeac0e735fcd4578d1d10da..dd901bdf9a172fa7408c623c3c555bdf5e1a83cc 100644 (file)
--- a/gdb.cc
+++ b/gdb.cc
@@ -31,12 +31,12 @@
 #include <ctime>                   // for strftime
 #include <iterator>                // for next
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QList>            // for QList
-#include <QtCore/QString>          // for QString, operator!=, operator==
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
-#include <QtCore/QtGlobal>         // for qPrintable, Q_UNUSED, foreach
+#include <QByteArray>              // for QByteArray
+#include <QList>                   // for QList
+#include <QString>                 // for QString, operator!=, operator==
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
+#include <QtGlobal>                // for qPrintable, Q_UNUSED, foreach
 
 #include "defs.h"
 

diff --git a/geo.cc b/geo.cc
index 4f619def69e30ea9a61397982293b61a701ab84b..bd84344e2598db27036172439dd70d5edbe3ebbe 100644 (file)
--- a/geo.cc
+++ b/geo.cc
@@ -18,9 +18,9 @@
  */
 #include "defs.h"
 #include "src/core/file.h"
-#include <QtCore/QDebug>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
+#include <QDebug>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 static char* deficon = nullptr;
 static char* nuke_placer;

diff --git a/geojson.cc b/geojson.cc
index 2e0f27f73bca4e5762230c1e0cddf51623655d43..1c914dcdfad355bc876156b1540b8875ad65046c 100644 (file)
--- a/geojson.cc
+++ b/geojson.cc
@@ -17,14 +17,14 @@
 
  */
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QIODevice>        // for operator|, QIODevice, QIODevice::ReadOnly, QIODevice::Text
-#include <QtCore/QJsonArray>       // for QJsonArray
-#include <QtCore/QJsonDocument>    // for QJsonDocument, QJsonDocument::Compact, QJsonDocument::Indented, QJsonDocument::JsonFormat
-#include <QtCore/QJsonObject>      // for QJsonObject
-#include <QtCore/QJsonParseError>  // for QJsonParseError
-#include <QtCore/QJsonValue>       // for QJsonValue
-#include <QtCore/QJsonValueRef>    // for QJsonValueRef
+#include <QByteArray>              // for QByteArray
+#include <QIODevice>               // for operator|, QIODevice, QIODevice::ReadOnly, QIODevice::Text
+#include <QJsonArray>              // for QJsonArray
+#include <QJsonDocument>           // for QJsonDocument, QJsonDocument::Compact, QJsonDocument::Indented, QJsonDocument::JsonFormat
+#include <QJsonObject>             // for QJsonObject
+#include <QJsonParseError>         // for QJsonParseError
+#include <QJsonValue>              // for QJsonValue
+#include <QJsonValueRef>           // for QJsonValueRef
 
 #include "defs.h"
 #include "geojson.h"

diff --git a/geojson.h b/geojson.h
index 26c729dbb42a9eed7e3e2b911e23b7b85ef1c2d3..f059ba7df783457dd818c0f1268b558b9ed70576 100644 (file)
--- a/geojson.h
+++ b/geojson.h
@@ -19,11 +19,11 @@
 #ifndef GEOJSON_H_INCLUDED_
 #define GEOJSON_H_INCLUDED_
 
-#include <QtCore/QJsonArray>         // for QJsonArray
-#include <QtCore/QJsonObject>        // for QJsonObject
-#include <QtCore/QStaticStringData>  // for QStaticStringData
-#include <QtCore/QString>            // for QString, QStringLiteral
-#include <QtCore/QVector>            // for QVector
+#include <QJsonArray>                // for QJsonArray
+#include <QJsonObject>               // for QJsonObject
+#include <QStaticStringData>         // for QStaticStringData
+#include <QString>                   // for QString, QStringLiteral
+#include <QVector>                   // for QVector
 
 #include "defs.h"
 #include "format.h"                  // for Format

diff --git a/ggv_bin.cc b/ggv_bin.cc
index 40b0b18c3bec66492051fe65b2a4bfad08c7d7d8..45c152a3a30d5e864505fb759c5cb5c5988b66d2 100644 (file)
--- a/ggv_bin.cc
+++ b/ggv_bin.cc
@@ -21,11 +21,11 @@
 
 */
 
-#include <QtCore/QByteArray>
-#include <QtCore/QDataStream>
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QtEndian>
+#include <QByteArray>
+#include <QDataStream>
+#include <QDebug>
+#include <QFile>
+#include <QtEndian>
 
 #include "ggv_bin.h"
 

diff --git a/ggv_log.cc b/ggv_log.cc
index 1df0824a8da4c82847b0b57ea5e2cba9a30479c0..0faef6224e4f6c66075c49548a9bdbcd9e6140da 100644 (file)
--- a/ggv_log.cc
+++ b/ggv_log.cc
@@ -26,9 +26,9 @@
 #include <cstdint>                 // for int16_t
 #include <ctime>                   // for gmtime
 
-#include <QtCore/QString>          // for QString
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/QtGlobal>         // for foreach
+#include <QString>                 // for QString
+#include <QTime>                   // for QTime
+#include <QtGlobal>                // for foreach
 
 #include "defs.h"
 #include "gbfile.h"                // for gbfputint16, gbfclose, gbfopen, gbfputflt, gbfgetc, gbfputcstr, gbfputdbl, gbfread, gbfile

diff --git a/ggv_ovl.cc b/ggv_ovl.cc
index 98e10ceeb3296de334570ff1541995c784ce438e..21f03e553ae22a29d8cfd827022248c9e3774b43 100644 (file)
--- a/ggv_ovl.cc
+++ b/ggv_ovl.cc
@@ -22,9 +22,9 @@
 
 #include <cmath>            // for sin, cos, acos
 
-#include <QtCore/QString>   // for QString
-#include <QtCore/QVector>   // for QVector
-#include <QtCore/QtGlobal>  // for foreach
+#include <QString>          // for QString
+#include <QVector>          // for QVector
+#include <QtGlobal>         // for foreach
 
 #include "defs.h"
 #include "gbfile.h"         // for gbfprintf, gbfclose, gbfopen, gbfile
@@ -356,7 +356,7 @@ write_bounds()
 }
 
 static void
-draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art, 
+draw_symbol_basics(const OVL_SYMBOL_TYP typ, const int art,
                    const OVL_COLOR_TYP point_color, const Waypoint* wpt)
 {
   symbol_ct++;

diff --git a/globalsat_sport.cc b/globalsat_sport.cc
index fceea55057ac002c45453f36ba9b31c098e03619..f1a90318f603987f59945657949c28e95c92cae1 100644 (file)
--- a/globalsat_sport.cc
+++ b/globalsat_sport.cc
@@ -39,14 +39,14 @@
 #include <cstdio>               // for printf
 #include <cstdlib>              // for free, malloc
 
-#include <QtCore/QByteArray>    // for QByteArray
-#include <QtCore/QDate>         // for QDate
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/QTimeZone>     // for QTimeZone
-#include <QtCore/Qt>            // for LocalTime
-#include <QtCore/QtGlobal>      // for qPrintable
+#include <QByteArray>           // for QByteArray
+#include <QDate>                // for QDate
+#include <QDateTime>            // for QDateTime
+#include <QString>              // for QString
+#include <QTime>                // for QTime
+#include <QTimeZone>            // for QTimeZone
+#include <Qt>                   // for LocalTime
+#include <QtGlobal>             // for qPrintable
 
 #include "defs.h"
 #include "globalsat_sport.h"

diff --git a/globalsat_sport.h b/globalsat_sport.h
index 2b02a49c5ccc01948f4bc1ca73da26c6450f07fc..ce04e3a7c4a6c20b8258b9c32ec357dfefa6dabc 100644 (file)
--- a/globalsat_sport.h
+++ b/globalsat_sport.h
@@ -39,9 +39,9 @@
 
 #include <cstdint>           // for uint32_t, uint8_t, uint16_t, int16_t
 
-#include <QtCore/QString>    // for QString
-#include <QtCore/QTimeZone>  // for QTimeZone
-#include <QtCore/QVector>    // for QVector
+#include <QString>           // for QString
+#include <QTimeZone>         // for QTimeZone
+#include <QVector>           // for QVector
 
 #include "defs.h"
 #include "format.h"          // for Format

diff --git a/glogbook.cc b/glogbook.cc
index 83322987343ae96c57130e0a3e9a34f853be9c9d..8dd0ba7889983c89542c07a4c26c7fc65eb0c63d 100644 (file)
--- a/glogbook.cc
+++ b/glogbook.cc
@@ -23,8 +23,8 @@
 #include "src/core/file.h"
 #include "xmlgeneric.h"
 
-#include <QtCore/QXmlStreamAttributes>
-#include <QtCore/QXmlStreamWriter>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamWriter>
 
 static gbfile* ofd;
 static QString ostring;

diff --git a/googledir.cc b/googledir.cc
index f1d6b2f4dde046d28cf760a9042e3d0b4555304a..bf589762758f4dfd5634d033d088ed97a42b5645 100644 (file)
--- a/googledir.cc
+++ b/googledir.cc
@@ -28,7 +28,7 @@
 
 #include "defs.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 
 static QString encoded_points;
 static QString instructions;

diff --git a/gopal.cc b/gopal.cc
index d71c0054a76b9757c55045e728ca4e69ee4f489a..d80e7750df80834c4229e64eb05fc9da27dff78a 100644 (file)
--- a/gopal.cc
+++ b/gopal.cc
@@ -57,8 +57,8 @@
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
+#include <QDateTime>
+#include <QString>
 
 #define MYNAME "gopal"
 
@@ -174,7 +174,7 @@ gopal_read()
   char tbuffer[64];
   struct tm tm2;
   double lat_old = 0;
-  
+
 
   auto* route = new route_head;
   QDateTime qtx = QDateTime::fromSecsSinceEpoch(tx, Qt::UTC);

diff --git a/gpx.cc b/gpx.cc
index 2a5450b49590fcdce7023b0fe886ab6f02df7394..bc99de20549d61438411a074d0abf9c1c5d8f73a 100644 (file)
--- a/gpx.cc
+++ b/gpx.cc
@@ -24,25 +24,25 @@
 #include <cstdlib>                                 // for atoi, strtod
 #include <cstring>                                 // for strchr, strncpy
 
-#include <QtCore/QDate>                            // for QDate
-#include <QtCore/QDateTime>                        // for QDateTime
-#include <QtCore/QHash>                            // for QHash
-#include <QtCore/QIODevice>                        // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly
-#include <QtCore/QLatin1Char>                      // for QLatin1Char
-#include <QtCore/QLatin1String>                    // for QLatin1String
-#include <QtCore/QStaticStringData>                // for QStaticStringData
-#include <QtCore/QString>                          // for QString, QStringLiteral, operator+, operator==
-#include <QtCore/QStringList>                      // for QStringList
-#include <QtCore/QStringView>                      // for QStringView
-#include <QtCore/QTime>                            // for QTime
-#include <QtCore/QVersionNumber>                   // for QVersionNumber
-#include <QtCore/QXmlStreamAttribute>              // for QXmlStreamAttribute
-#include <QtCore/QXmlStreamAttributes>             // for QXmlStreamAttributes
-#include <QtCore/QXmlStreamNamespaceDeclaration>   // for QXmlStreamNamespaceDeclaration
-#include <QtCore/QXmlStreamNamespaceDeclarations>  // for QXmlStreamNamespaceDeclarations
-#include <QtCore/QXmlStreamReader>                 // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndDocument, QXmlStreamReader::EndElement, QXmlStreamReader::Invalid, QXmlStreamReader::StartElement
-#include <QtCore/Qt>                               // for CaseInsensitive, UTC
-#include <QtCore/QtGlobal>                         // for qAsConst, QAddConst<>::Type
+#include <QDate>                                   // for QDate
+#include <QDateTime>                               // for QDateTime
+#include <QHash>                                   // for QHash
+#include <QIODevice>                               // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly
+#include <QLatin1Char>                             // for QLatin1Char
+#include <QLatin1String>                           // for QLatin1String
+#include <QStaticStringData>                       // for QStaticStringData
+#include <QString>                                 // for QString, QStringLiteral, operator+, operator==
+#include <QStringList>                             // for QStringList
+#include <QStringView>                             // for QStringView
+#include <QTime>                                   // for QTime
+#include <QVersionNumber>                          // for QVersionNumber
+#include <QXmlStreamAttribute>                     // for QXmlStreamAttribute
+#include <QXmlStreamAttributes>                    // for QXmlStreamAttributes
+#include <QXmlStreamNamespaceDeclaration>          // for QXmlStreamNamespaceDeclaration
+#include <QXmlStreamNamespaceDeclarations>         // for QXmlStreamNamespaceDeclarations
+#include <QXmlStreamReader>                        // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndDocument, QXmlStreamReader::EndElement, QXmlStreamReader::Invalid, QXmlStreamReader::StartElement
+#include <Qt>                                      // for CaseInsensitive, UTC
+#include <QtGlobal>                                // for qAsConst, QAddConst<>::Type
 
 #include "defs.h"
 #include "gpx.h"

diff --git a/gpx.h b/gpx.h
index f378a326020c1c128cb9698b1edab92e784406d7..cc8baa75b8d19a9761d63772126e1ea9d802013e 100644 (file)
--- a/gpx.h
+++ b/gpx.h
@@ -21,14 +21,14 @@
 #ifndef GPX_H_INCLUDED_
 #define GPX_H_INCLUDED_
 
-#include <QtCore/QHash>                 // for QHash
-#include <QtCore/QString>               // for QString
-#include <QtCore/QStringList>           // for QStringList
-#include <QtCore/QStringView>           // for QStringView
-#include <QtCore/QVector>               // for QVector
-#include <QtCore/QVersionNumber>        // for QVersionNumber
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/QXmlStreamReader>      // for QXmlStreamReader
+#include <QHash>                        // for QHash
+#include <QString>                      // for QString
+#include <QStringList>                  // for QStringList
+#include <QStringView>                  // for QStringView
+#include <QVector>                      // for QVector
+#include <QVersionNumber>               // for QVersionNumber
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <QXmlStreamReader>             // for QXmlStreamReader
 
 #include "defs.h"
 #include "format.h"                     // for Format

diff --git a/gtm.cc b/gtm.cc
index 09615b8985d1e9b5136dc317e58193f2d69f624a..82c23766c0b470d5081468eb217680031940bdb5 100644 (file)
--- a/gtm.cc
+++ b/gtm.cc
@@ -26,7 +26,7 @@
 
 #include "defs.h"
 #include "jeeps/gpsmath.h"
-#include <QtCore/QList>
+#include <QList>
 
 static gbfile* file_in, *file_out;
 static int indatum;

diff --git a/gtrnctr.cc b/gtrnctr.cc
index efd134b80c430b0e5e1ef310818c7922da3991f7..693199fd1454f20d94da6b6287a2e32c3569006f 100644 (file)
--- a/gtrnctr.cc
+++ b/gtrnctr.cc
@@ -24,7 +24,7 @@
  * http://www8.garmin.com/xmlschemas/ActivityExtensionv2.xsd
  */
 
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 
 #include "defs.h"
 #include "xmlgeneric.h"

diff --git a/gui/aboutdlg.cc b/gui/aboutdlg.cc
index 2a408705002b4f9608705bd7e3ed9ed0492de51e..3e92bbe4f883bb70c506e25a7cda94697ff5b6b8 100644 (file)
--- a/gui/aboutdlg.cc
+++ b/gui/aboutdlg.cc
@@ -21,9 +21,9 @@
 //
 
 #include "aboutdlg.h"
-#include <QtGui/QTextCursor>          // for QTextCursor
-#include <QtGui/QTextDocument>        // for QTextDocument
-#include <QtWidgets/QTextEdit>        // for QTextEdit
+#include <QTextCursor>                // for QTextCursor
+#include <QTextDocument>              // for QTextDocument
+#include <QTextEdit>                  // for QTextEdit
 #include "appname.h"                  // for appName
 #include "upgrade.h"                  // for UpgradeCheck
 

diff --git a/gui/aboutdlg.h b/gui/aboutdlg.h
index e08c71e4d559192dc21c89e3a2377db92e6c603d..a93ac2a6d515393fcfc3f24872ef38f249d96cbe 100644 (file)
--- a/gui/aboutdlg.h
+++ b/gui/aboutdlg.h
@@ -23,9 +23,9 @@
 #ifndef ABOUTDLG_H
 #define ABOUTDLG_H
 
-#include <QtCore/QString>     // for QString
-#include <QtWidgets/QDialog>  // for QDialog
-#include <QtWidgets/QWidget>  // for QWidget
+#include <QString>            // for QString
+#include <QDialog>            // for QDialog
+#include <QWidget>            // for QWidget
 #include "ui_aboutui.h"       // for Ui_AboutDlg
 
 class AboutDlg: public QDialog

diff --git a/gui/coretool/coretool.cc b/gui/coretool/coretool.cc
index c6cedbde73011f9c4b66077b7e6cd68ecf103525..fe562e3faa4a0018f1e6683e5fdbc763970924b3 100644 (file)
--- a/gui/coretool/coretool.cc
+++ b/gui/coretool/coretool.cc
@@ -1,5 +1,5 @@
-#include <QtCore/QList>
-#include <QtWidgets/QApplication>
+#include <QList>
+#include <QApplication>
 
 #include "format.h"
 #include "formatload.h"

diff --git a/gui/filterdata.cc b/gui/filterdata.cc
index 3c4d6715c52b2748bb38b35eea41824450157c2a..f0ff55f9b01d6e111aaad9c36b7ab67fe5df7833 100644 (file)
--- a/gui/filterdata.cc
+++ b/gui/filterdata.cc
@@ -227,7 +227,7 @@ QStringList MiscFltFilterData::makeOptionString()
       s += QString(",%1").arg(trkopts.at(sortTrkBy_));
     }
     args << s;
-    
+
   }
   return args;
 }

diff --git a/gui/filterdata.h b/gui/filterdata.h
index 954b3f2d5c9f4041c360790f2d799861d542a16c..73018734767321d908f4270e2279e952edde3193 100644 (file)
--- a/gui/filterdata.h
+++ b/gui/filterdata.h
@@ -136,7 +136,7 @@ public:
 class WayPtsFilterData: public FilterData
 {
 public:
-  WayPtsFilterData(): 
+  WayPtsFilterData():
     duplicates(false), shortNames(true), locations(false),
     position(false), radius(false),
     positionVal(0.0), radiusVal(0.0),
@@ -175,7 +175,7 @@ public:
 class RtTrkFilterData: public FilterData
 {
 public:
-  RtTrkFilterData(): 
+  RtTrkFilterData():
     simplify_(false),
     reverse_(false),
     limitTo_(100)
@@ -200,7 +200,7 @@ public:
 class MiscFltFilterData: public FilterData
 {
 public:
-  MiscFltFilterData(): 
+  MiscFltFilterData():
     nukeRoutes_(false),
     nukeTracks_(false),
     nukeWaypoints_(false),

diff --git a/gui/formatload.cc b/gui/formatload.cc
index dbd5629b6c2c27f155902aed0bfbb8c8cd3bea15..9b2b329e0b0c922509404ef089990811c2b63152 100644 (file)
--- a/gui/formatload.cc
+++ b/gui/formatload.cc
@@ -22,22 +22,22 @@
 //------------------------------------------------------------------------
 
 #include "formatload.h"
-#include <QtCore/QByteArray>               // for QByteArray
-#include <QtCore/QChar>                    // for operator==, QChar
-#include <QtCore/QCharRef>                 // for QCharRef
-#include <QtCore/QCoreApplication>         // for QCoreApplication
+#include <QByteArray>                      // for QByteArray
+#include <QChar>                           // for operator==, QChar
+#include <QCharRef>                        // for QCharRef
+#include <QCoreApplication>                // for QCoreApplication
 #ifdef GENERATE_CORE_STRINGS
-#include <QtCore/QDebug>                   // for QDebug, operator<<
+#include <QDebug>                          // for QDebug, operator<<
 #endif
-#include <QtCore/QObject>                  // for QObject
-#include <QtCore/QProcess>                 // for QProcess
-#include <QtCore/QRegularExpression>       // for QRegularExpression
-#include <QtCore/QRegularExpressionMatch>  // for QRegularExpressionMatch
-#include <QtCore/QString>                  // for QString, operator+
-#include <QtCore/QTextStream>              // for QTextStream
-#include <QtCore/QVariant>                 // for QVariant
-#include <QtWidgets/QApplication>          // for QApplication
-#include <QtWidgets/QMessageBox>           // for QMessageBox
+#include <QObject>                         // for QObject
+#include <QProcess>                        // for QProcess
+#include <QRegularExpression>              // for QRegularExpression
+#include <QRegularExpressionMatch>         // for QRegularExpressionMatch
+#include <QString>                         // for QString, operator+
+#include <QTextStream>                     // for QTextStream
+#include <QVariant>                        // for QVariant
+#include <QApplication>                    // for QApplication
+#include <QMessageBox>                     // for QMessageBox
 #include "appname.h"                       // for appName
 
 

diff --git a/gui/formatload.h b/gui/formatload.h
index 5f24e62c621fde8bdc8be188b07307f1f48736be..2bcacd13065d9af59381608bb11e49a75b0bd444 100644 (file)
--- a/gui/formatload.h
+++ b/gui/formatload.h
@@ -25,8 +25,8 @@
 #ifndef FORMATLOAD_H
 #define FORMATLOAD_H
 
-#include <QtCore/QList>        // for QList
-#include <QtCore/QStringList>  // for QStringList
+#include <QList>               // for QList
+#include <QStringList>         // for QStringList
 
 #include "format.h"            // for Format
 

diff --git a/gui/gpx.h b/gui/gpx.h
index a09d40dbe608f2ddbf3f10d6cb8ce958456d3dd7..0096fdd32b2a5b6ec3fa944239795985d3a2d8f7 100644 (file)
--- a/gui/gpx.h
+++ b/gui/gpx.h
@@ -373,7 +373,7 @@ private:
 class GpxWaypoint: public GpxItem
 {
 public:
-  GpxWaypoint(): 
+  GpxWaypoint():
     location_(LatLng(0, 0)),
     elevation_(-1.0E-100),
     name_(QString()),

diff --git a/gui/help.cc b/gui/help.cc
index 85aea4f015c155e9fce7dd0bd04a4aab51a1c557..bf05187d07f4d2d5ddf20eb4f0241cd6d0a1e764 100644 (file)
--- a/gui/help.cc
+++ b/gui/help.cc
@@ -22,10 +22,10 @@
 //------------------------------------------------------------------------
 #include "help.h"
 
-#include <QtCore/QRegularExpression>  // for QRegularExpression
-#include <QtCore/QString>             // for QString
-#include <QtCore/QUrl>                // for QUrl
-#include <QtGui/QDesktopServices>     // for QDesktopServices
+#include <QRegularExpression>         // for QRegularExpression
+#include <QString>                    // for QString
+#include <QUrl>                       // for QUrl
+#include <QDesktopServices>           // for QDesktopServices
 
 #include "format.h"                   // for Format
 

diff --git a/gui/help.h b/gui/help.h
index 5d3dae63a1885099342958ec3be1e1420b95bc39..d7b8b13704bc05eafd531d123ac66b91d1ea06b6 100644 (file)
--- a/gui/help.h
+++ b/gui/help.h
@@ -22,7 +22,7 @@
 
 #ifndef HELP_H
 #define HELP_H
-#include <QtCore/QString>  // for QString
+#include <QString>         // for QString
 
 extern void ShowHelp(const QString& name);
 

diff --git a/gui/main.cc b/gui/main.cc
index cb204d1599bec45015e8facfa9bb0d24dbe121dd..60788074e8efc1b56b2611890ace8bbec977c737 100644 (file)
--- a/gui/main.cc
+++ b/gui/main.cc
@@ -20,9 +20,9 @@
 //  USA.
 //
 //------------------------------------------------------------------------
-#include <QtCore/QtGlobal>         // for QT_VERSION, QT_VERSION_CHECK
-#include <QtGui/QIcon>             // for QIcon
-#include <QtWidgets/QApplication>  // for QApplication
+#include <QtGlobal>                // for QT_VERSION, QT_VERSION_CHECK
+#include <QIcon>                   // for QIcon
+#include <QApplication>            // for QApplication
 
 #include "mainwindow.h"             // for MainWindow
 

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index 1c5af45af4be9837edd369557712126c389bd9bf..63b1a2400270c519d7453c6d7795cf8bf9c00b44 100644 (file)
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -19,41 +19,41 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 //  USA.
 //
-#include <QtCore/QByteArray>           // for QByteArray
-#include <QtCore/QDate>                // for QDate
-#include <QtCore/QDateTime>            // for QDateTime
-#include <QtCore/QDir>                 // for QDir
-#include <QtCore/QEvent>               // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange)
-#include <QtCore/QFile>                // for QFile
-#include <QtCore/QFileInfo>            // for QFileInfo
-#include <QtCore/QLibraryInfo>         // for QLibraryInfo, QLibraryInfo::TranslationsPath
-#include <QtCore/QLocale>              // for QLocale
-#include <QtCore/QMimeData>            // for QMimeData
-#include <QtCore/QProcess>             // for QProcess, QProcess::NotRunning
-#include <QtCore/QSettings>            // for QSettings
-#include <QtCore/QString>              // for QString
-#include <QtCore/QStringList>          // for QStringList
-#include <QtCore/QTemporaryFile>       // for QTemporaryFile
-#include <QtCore/QTime>                // for QTime
-#include <QtCore/QUrl>                 // for QUrl
-#include <QtCore/QVariant>             // for QVariant
-#include <QtCore/Qt>                   // for SmoothTransformation, WaitCursor
-#include <QtCore/QtGlobal>             // for foreach
-#include <QtGui/QCursor>               // for QCursor
-#include <QtGui/QDesktopServices>      // for QDesktopServices
-#include <QtGui/QIcon>                 // for QIcon
-#include <QtGui/QImage>                // for QImage
-#include <QtGui/QTextCharFormat>       // for QTextCharFormat
-#include <QtWidgets/QAbstractButton>   // for QAbstractButton
-#include <QtWidgets/QApplication>      // for QApplication, qApp
-#include <QtWidgets/QCheckBox>         // for QCheckBox
-#include <QtWidgets/QDialogButtonBox>  // for QDialogButtonBox
-#include <QtWidgets/QFileDialog>       // for QFileDialog
-#include <QtWidgets/QMessageBox>       // for QMessageBox, operator|, QMessageBox::Yes, QMessageBox::No
-#include <QtWidgets/QPlainTextEdit>    // for QPlainTextEdit
-#include <QtWidgets/QPushButton>       // for QPushButton
-#include <QtWidgets/QRadioButton>      // for QRadioButton
-#include <QtWidgets/QStackedWidget>    // for QStackedWidget
+#include <QByteArray>                  // for QByteArray
+#include <QDate>                       // for QDate
+#include <QDateTime>                   // for QDateTime
+#include <QDir>                        // for QDir
+#include <QEvent>                      // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange)
+#include <QFile>                       // for QFile
+#include <QFileInfo>                   // for QFileInfo
+#include <QLibraryInfo>                // for QLibraryInfo, QLibraryInfo::TranslationsPath
+#include <QLocale>                     // for QLocale
+#include <QMimeData>                   // for QMimeData
+#include <QProcess>                    // for QProcess, QProcess::NotRunning
+#include <QSettings>                   // for QSettings
+#include <QString>                     // for QString
+#include <QStringList>                 // for QStringList
+#include <QTemporaryFile>              // for QTemporaryFile
+#include <QTime>                       // for QTime
+#include <QUrl>                        // for QUrl
+#include <QVariant>                    // for QVariant
+#include <Qt>                          // for SmoothTransformation, WaitCursor
+#include <QtGlobal>                    // for foreach
+#include <QCursor>                     // for QCursor
+#include <QDesktopServices>            // for QDesktopServices
+#include <QIcon>                       // for QIcon
+#include <QImage>                      // for QImage
+#include <QTextCharFormat>             // for QTextCharFormat
+#include <QAbstractButton>             // for QAbstractButton
+#include <QApplication>                // for QApplication, qApp
+#include <QCheckBox>                   // for QCheckBox
+#include <QDialogButtonBox>            // for QDialogButtonBox
+#include <QFileDialog>                 // for QFileDialog
+#include <QMessageBox>                 // for QMessageBox, operator|, QMessageBox::Yes, QMessageBox::No
+#include <QPlainTextEdit>              // for QPlainTextEdit
+#include <QPushButton>                 // for QPushButton
+#include <QRadioButton>                // for QRadioButton
+#include <QStackedWidget>              // for QStackedWidget
 
 #include <cstdlib>                     // for exit
 

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index c3539a502ec37e2fb0337737ba3848213036390b..d899ff02c499a6e4aa62e20ead90d8e4bd09c606 100644 (file)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -22,22 +22,22 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtCore/QEvent>          // for QEvent
-#include <QtCore/QList>           // for QList
-#include <QtCore/QObject>         // for QObject (& Q_OBJECT, slots)
-#include <QtCore/QString>         // for QString
-#include <QtCore/QStringList>     // for QStringList
-#include <QtCore/QTranslator>     // for QTranslator
-#include <QtGui/QCloseEvent>      // for QCloseEvent
-#include <QtGui/QDragEnterEvent>  // for QDragEnterEvent
-#include <QtGui/QDropEvent>       // for QDropEvent
-#include <QtGui/QPixmap>          // for QPixmap
-#include <QtWidgets/QAction>      // for QAction
-#include <QtWidgets/QComboBox>    // for QComboBox
-#include <QtWidgets/QLabel>       // for QLabel
-#include <QtWidgets/QLineEdit>    // for QLineEdit
-#include <QtWidgets/QMainWindow>  // for QMainWindow
-#include <QtWidgets/QWidget>      // for QWidget
+#include <QEvent>                 // for QEvent
+#include <QList>                  // for QList
+#include <QObject>                // for QObject (& Q_OBJECT, slots)
+#include <QString>                // for QString
+#include <QStringList>            // for QStringList
+#include <QTranslator>            // for QTranslator
+#include <QCloseEvent>            // for QCloseEvent
+#include <QDragEnterEvent>        // for QDragEnterEvent
+#include <QDropEvent>             // for QDropEvent
+#include <QPixmap>                // for QPixmap
+#include <QAction>                // for QAction
+#include <QComboBox>              // for QComboBox
+#include <QLabel>                 // for QLabel
+#include <QLineEdit>              // for QLineEdit
+#include <QMainWindow>            // for QMainWindow
+#include <QWidget>                // for QWidget
 
 #include "babeldata.h"            // for BabelData
 #include "filterdata.h"           // for AllFiltersData

diff --git a/gui/processwait.cc b/gui/processwait.cc
index 3492bbe6751b4bb95debefd72102b21db107da1a..5337dba21b73816cd67bd97474bceda9647f3bf7 100644 (file)
--- a/gui/processwait.cc
+++ b/gui/processwait.cc
@@ -22,12 +22,12 @@
 //------------------------------------------------------------------------
 #include "processwait.h"
 
-#include <QtCore/QByteArray>          // for QByteArray
-#include <QtCore/Qt>                  // for Horizontal, WindowContextHelpButtonHint
-#include <QtGui/QTextCursor>          // for QTextCursor, QTextCursor::End
-#include <QtWidgets/QAbstractButton>  // for QAbstractButton
-#include <QtWidgets/QPushButton>      // for QPushButton
-#include <QtWidgets/QVBoxLayout>      // for QVBoxLayout
+#include <QByteArray>                 // for QByteArray
+#include <Qt>                         // for Horizontal, WindowContextHelpButtonHint
+#include <QTextCursor>                // for QTextCursor, QTextCursor::End
+#include <QAbstractButton>            // for QAbstractButton
+#include <QPushButton>                // for QPushButton
+#include <QVBoxLayout>                // for QVBoxLayout
 
 #include <cstdlib>                    // for abs
 #include <string>                     // for string

diff --git a/gui/processwait.h b/gui/processwait.h
index b9eaa8e7da6e7f3bf831edc1f9d8a9aebf6afb91..334e8e54daf4f1d1783135784eca5169a2de976c 100644 (file)
--- a/gui/processwait.h
+++ b/gui/processwait.h
@@ -23,17 +23,17 @@
 #ifndef PROCESSWAIT_H
 #define PROCESSWAIT_H
 
-#include <QtCore/QByteArray>           // for QByteArray
-#include <QtCore/QObject>              // for QObject
-#include <QtCore/QProcess>             // for QProcess, QProcess::ExitStatus, QProcess::ProcessError
-#include <QtCore/QString>              // for QString
-#include <QtCore/QTimer>               // for QTimer
-#include <QtGui/QCloseEvent>           // for QCloseEvent
-#include <QtWidgets/QDialog>           // for QDialog
-#include <QtWidgets/QDialogButtonBox>  // for QDialogButtonBox
-#include <QtWidgets/QPlainTextEdit>    // for QPlainTextEdit
-#include <QtWidgets/QProgressBar>      // for QProgressBar
-#include <QtWidgets/QWidget>           // for QWidget
+#include <QByteArray>                  // for QByteArray
+#include <QObject>                     // for QObject
+#include <QProcess>                    // for QProcess, QProcess::ExitStatus, QProcess::ProcessError
+#include <QString>                     // for QString
+#include <QTimer>                      // for QTimer
+#include <QCloseEvent>                 // for QCloseEvent
+#include <QDialog>                     // for QDialog
+#include <QDialogButtonBox>            // for QDialogButtonBox
+#include <QPlainTextEdit>              // for QPlainTextEdit
+#include <QProgressBar>                // for QProgressBar
+#include <QWidget>                     // for QWidget
 
 
 //------------------------------------------------------------------------

diff --git a/gui/runmachine.cc b/gui/runmachine.cc
index 7fbe49c9e20e08aa3173996ea9c903b4fa3c6ff4..6bc3eceb0442fca670003b60d2f40f5694177b96 100644 (file)
--- a/gui/runmachine.cc
+++ b/gui/runmachine.cc
@@ -19,11 +19,11 @@
 
 #include "runmachine.h"
 
-#include <QtCore/QDebug>             // for qDebug
-#include <QtCore/QEventLoop>         // for QEventLoop
-#include <QtCore/QNonConstOverload>  // for QNonConstOverload
-#include <QtCore/QtGlobal>           // for QOverload, qOverload
-#include <QtWidgets/QDialog>         // for QDialog
+#include <QDebug>                    // for qDebug
+#include <QEventLoop>                // for QEventLoop
+#include <QNonConstOverload>         // for QNonConstOverload
+#include <QtGlobal>                  // for QOverload, qOverload
+#include <QDialog>                   // for QDialog
 
 #include "appname.h"                 // for appName
 

diff --git a/gui/runmachine.h b/gui/runmachine.h
index 27b81698b3046fa0eeecb579f773456d838dbe5f..0c5da6371f23fee8f7399f2ced2c4378017a265c 100644 (file)
--- a/gui/runmachine.h
+++ b/gui/runmachine.h
@@ -20,11 +20,11 @@
 #ifndef RUNMACHINE_H
 #define RUNMACHINE_H
 
-#include <QtCore/QObject>      // for QObject
-#include <QtCore/QProcess>     // for QProcess, QProcess::ExitStatus, QProcess::ProcessError, qt_getEnumName
-#include <QtCore/QString>      // for QString
-#include <QtCore/QStringList>  // for QStringList
-#include <QtWidgets/QWidget>   // for QWidget
+#include <QObject>             // for QObject
+#include <QProcess>            // for QProcess, QProcess::ExitStatus, QProcess::ProcessError, qt_getEnumName
+#include <QString>             // for QString
+#include <QStringList>         // for QStringList
+#include <QWidget>             // for QWidget
 
 #include <optional>            // for optional, nullopt
 

diff --git a/gui/serial_unix.cc b/gui/serial_unix.cc
index 1b5af93c6e60accabe4750035575681d55c11c01..ce44710f5a5f4077bf945296b5e99429aca1e0de 100644 (file)
--- a/gui/serial_unix.cc
+++ b/gui/serial_unix.cc
@@ -23,11 +23,11 @@
 #ifdef HAVE_UDEV
 #include <libudev.h>            // for udev_device_get_property_value, udev_device_get_devnode, udev_device_new_from_syspath, udev_device_unref, udev_enumerate_add_match_subsystem, udev_enumerate_get_list_entry, udev_enumerate_new, udev_enumerate_scan_devices, udev_enumerate_unref, udev_list_ent...
 
-#include <QtCore/QDebug>        // for QDebug
-#include <QtCore/QSet>          // for QSet
-#include <QtCore/QString>       // for QString, operator==
-#include <QtCore/QStringList>   // for QStringList
-#include <QtWidgets/QComboBox>  // for QComboBox
+#include <QDebug>               // for QDebug
+#include <QSet>                 // for QSet
+#include <QString>              // for QString, operator==
+#include <QStringList>          // for QStringList
+#include <QComboBox>            // for QComboBox
 
 #include "mainwindow.h"         // for MainWindow
 

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 5674a08aca636163658379e76e556befa1e2d373..2affa3dd45376958b4db58044c22514502e0f57e 100644 (file)
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -20,20 +20,20 @@
  */
 
 #include "upgrade.h"
-#include <QtCore/qglobal.h>                 // for qDebug
-#include <QtCore/QByteArray>                // for QByteArray
-#include <QtCore/QDebug>                    // for QDebug
-#include <QtCore/QLocale>                   // for QLocale
-#include <QtCore/QSysInfo>                  // for QSysInfo
-#include <QtCore/QUrl>                      // for QUrl
-#include <QtCore/QVariant>                  // for QVariant
-#include <QtCore/QVersionNumber>            // for QVersionNumber, operator<, operator==
-#include <QtCore/Qt>                        // for ISODate, RichText
-#include <QtGui/QDesktopServices>           // for QDesktopServices
-#include <QtNetwork/QNetworkAccessManager>  // for QNetworkAccessManager
-#include <QtNetwork/QNetworkReply>          // for QNetworkReply, QNetworkReply::NoError
-#include <QtNetwork/QNetworkRequest>        // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::Redi...
-#include <QtWidgets/QMessageBox>            // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No
+#include <qglobal.h>                        // for qDebug
+#include <QByteArray>                       // for QByteArray
+#include <QDebug>                           // for QDebug
+#include <QLocale>                          // for QLocale
+#include <QSysInfo>                         // for QSysInfo
+#include <QUrl>                             // for QUrl
+#include <QVariant>                         // for QVariant
+#include <QVersionNumber>                   // for QVersionNumber, operator<, operator==
+#include <Qt>                               // for ISODate, RichText
+#include <QDesktopServices>                 // for QDesktopServices
+#include <QNetworkAccessManager>            // for QNetworkAccessManager
+#include <QNetworkReply>                    // for QNetworkReply, QNetworkReply::NoError
+#include <QNetworkRequest>                  // for QNetworkRequest, QNetworkRequest::ContentTypeHeader, QNetworkRequest::HttpReasonPhraseAttribute, QNetworkRequest::HttpStatusCodeAttribute, QNetworkRequest::NoLessSafeRedirectPolicy, QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::Redi...
+#include <QMessageBox>                      // for QMessageBox, QMessageBox::Yes, operator|, QMessageBox::No
 #include <QtXml/QDomDocument>               // for QDomDocument
 #include <QtXml/QDomElement>                // for QDomElement
 #include <QtXml/QDomNode>                   // for QDomNode

diff --git a/gui/upgrade.h b/gui/upgrade.h
index e9984a2d40e4c463db52ce44219b12a8850f2ee8..d5a3780d12075515782f09fe9df8d8388448171a 100644 (file)
--- a/gui/upgrade.h
+++ b/gui/upgrade.h
@@ -19,14 +19,14 @@
 
  */
 
-#include <QtCore/QDateTime>                 // for QDateTime
-#include <QtCore/QList>                     // for QList
-#include <QtCore/QObject>                   // for QObject
-#include <QtCore/QString>                   // for QString
-#include <QtCore/QUrl>                      // for QUrl
-#include <QtNetwork/QNetworkAccessManager>  // for QNetworkAccessManager
-#include <QtNetwork/QNetworkReply>          // for QNetworkReply
-#include <QtWidgets/QWidget>                // for QWidget
+#include <QDateTime>                        // for QDateTime
+#include <QList>                            // for QList
+#include <QObject>                          // for QObject
+#include <QString>                          // for QString
+#include <QUrl>                             // for QUrl
+#include <QNetworkAccessManager>            // for QNetworkAccessManager
+#include <QNetworkReply>                    // for QNetworkReply
+#include <QWidget>                          // for QWidget
 #include "babeldata.h"                      // for BabelData
 #include "format.h"                         // for Format
 

diff --git a/height.h b/height.h
index 67aff60520249cdbbf0c659a7a7d777c22a66126..b59ffe94cc7864c0769dce6885d71cad603c52e5 100644 (file)
--- a/height.h
+++ b/height.h
@@ -26,7 +26,7 @@
 
 #include <cstdint>         // for int8_t in heightgrid.h
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"          // for arglist_t, ARG_NOMINMAX, ARGTYPE_BEGIN_REQ, ARGTYPE_BOOL, ARGTYPE_END_REQ, ARGTYPE_FLOAT, Waypoint
 #include "filter.h"        // for Filter

diff --git a/hiketech.cc b/hiketech.cc
index 2dee6dab764ad35a35391ba4856107dd55df2f9a..b86d43d905e75b3a7a41e009f7f6d2e9443af7b3 100644 (file)
--- a/hiketech.cc
+++ b/hiketech.cc
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "src/core/xmlstreamwriter.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 #include <cstdio>
 
 static gbfile* ofd;
@@ -134,9 +134,9 @@ hiketech_format_time(const QDateTime& t)
 static void
 hiketech_trkpt_pr(const Waypoint* waypointp)
 {
-  writer.writeStartElement(QStringLiteral("pnt")); 
+  writer.writeStartElement(QStringLiteral("pnt"));
   if (waypointp->creation_time.isValid()) {
-    writer.writeTextElement(QStringLiteral("utc"), 
+    writer.writeTextElement(QStringLiteral("utc"),
                             hiketech_format_time(waypointp->GetCreationTime()));
   }
   writer.writeTextElement(QStringLiteral("lat"), QString::number(waypointp->latitude,'f', 6));
@@ -150,13 +150,13 @@ hiketech_trkpt_pr(const Waypoint* waypointp)
 static void
 hiketech_waypt_pr(const Waypoint* wpt)
 {
-  writer.writeStartElement(QStringLiteral("wpt")); 
+  writer.writeStartElement(QStringLiteral("wpt"));
   writer.setAutoFormattingIndent(-1);
   writer.writeTextElement(QStringLiteral("ident"), wpt->shortname);
   writer.writeTextElement(QStringLiteral("sym"), wpt->icon_descr);
   writer.writeTextElement(QStringLiteral("lat"), QString::number(wpt->latitude, 'f', 6));
   writer.writeTextElement(QStringLiteral("long"), QString::number(wpt->longitude, 'f', 6));
-  writer.writeStartElement(QStringLiteral("color")); 
+  writer.writeStartElement(QStringLiteral("color"));
   writer.writeTextElement(QStringLiteral("lbl"), QStringLiteral("FAFFB4"));
   writer.writeTextElement(QStringLiteral("obj"), QStringLiteral("FF8000"));
   writer.writeEndElement(); // color

diff --git a/html.cc b/html.cc
index 20c33cb9d72d2fb1fd6155acad8f00fe787ffa72..53b9da72cdcb727b582f1919587f0c2982012680 100644 (file)
--- a/html.cc
+++ b/html.cc
@@ -22,9 +22,9 @@
 #include <cstdint>
 #include <ctime>                   // for localtime
 
-#include <QtCore/QString>          // for QString, operator!=
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
+#include <QString>                 // for QString, operator!=
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
 
 #include "defs.h"
 #include "formspec.h"              // for FsChainFind, kFsGpx

diff --git a/humminbird.cc b/humminbird.cc
index 7a5adf5bb02f16ce4672a00c507f1dd199ba5a7d..4033937082ace0968f9df4eab6759ec84857f347 100644 (file)
--- a/humminbird.cc
+++ b/humminbird.cc
@@ -20,7 +20,7 @@
  */
 
 #include "defs.h"
-#include <QtCore/QMap>
+#include <QMap>
 #include <cmath>
 #include <cstdio>
 

diff --git a/igc.cc b/igc.cc
index 1f5d772a538f70e309a679a7bdb98653ddca2fcf..53e4b6dec5d7ce55e14cab48ee81a481972c3a38 100644 (file)
--- a/igc.cc
+++ b/igc.cc
@@ -31,11 +31,11 @@
 #include <iterator>                  // for reverse_iterator, operator==, prev, next
 #include <optional>                  // for optional
 
-#include <QtCore/QByteArray>         // for QByteArray
-#include <QtCore/QList>              // for QList<>::const_iterator
-#include <QtCore/QStaticStringData>  // for QStaticStringData
-#include <QtCore/QString>            // for QString, operator+, QStringLiteral
-#include <QtCore/QtGlobal>           // for foreach, qPrintable
+#include <QByteArray>                // for QByteArray
+#include <QList>                     // for QList<>::const_iterator
+#include <QStaticStringData>         // for QStaticStringData
+#include <QString>                   // for QString, operator+, QStringLiteral
+#include <QtGlobal>                  // for foreach, qPrintable
 
 #include "defs.h"
 #include "cet_util.h"                // for cet_convert_init
@@ -501,7 +501,7 @@ static void detect_other_track(const route_head* rh)
   }
   // Find other track with the most waypoints
   if (rh->rte_waypt_ct > max_waypt_ct &&
-      (rh->rte_name.isEmpty() || 
+      (rh->rte_name.isEmpty() ||
        (!rh->rte_name.startsWith(PRESTRKNAME) &&
        !rh->rte_name.startsWith(GNSSTRKNAME)))) {
     head = rh;
@@ -683,7 +683,7 @@ static void wr_task_hdr(const route_head* rte)
   }
 
   if (!rte->rte_desc.isEmpty()) {
-    // desc will be something like "IGCDATE160701: 500KTri" 
+    // desc will be something like "IGCDATE160701: 500KTri"
     sscanf(CSTR(rte->rte_desc), DATEMAGIC "%6[0-9]: %s", flight_date, task_desc);
   }
 

diff --git a/ignrando.cc b/ignrando.cc
index e9dbfb868a1517a5945018a64774ecafe00f42a2..f5e5b385527aea2fc379ebc27af8a7f85cc64a03 100644 (file)
--- a/ignrando.cc
+++ b/ignrando.cc
@@ -21,7 +21,7 @@
 
 #include "defs.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 #include <cstdio>
 
 #define MYNAME "IGNRando"

diff --git a/igo8.cc b/igo8.cc
index fc984c8c0933e60af59a6ace23efe3a988618444..8b361a7944555f1ede4873b32d59a1e767ad9fc1 100644 (file)
--- a/igo8.cc
+++ b/igo8.cc
@@ -67,10 +67,10 @@
 #include <cstdlib>              // for atoi
 #include <cstring>              // for memset
 
-#include <QtCore/QChar>         // for QChar
-#include <QtCore/QString>       // for QString
-#include <QtCore/QVector>       // for QVector
-#include <QtCore/QtGlobal>      // for ushort
+#include <QChar>                // for QChar
+#include <QString>              // for QString
+#include <QVector>              // for QVector
+#include <QtGlobal>             // for ushort
 
 #include "defs.h"
 #include "gbfile.h"             // for gbfwrite, gbfclose, gbfseek, gbfgetint32, gbfread, gbfile, gbfopen_le

diff --git a/ik3d.cc b/ik3d.cc
index 449113ecfef346ab15db64c8c72400aab86b13fb..ea2991947553d354fe8a2e28acbad56e05040ed5 100644 (file)
--- a/ik3d.cc
+++ b/ik3d.cc
@@ -23,7 +23,7 @@
 
 #include "defs.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 
 static QVector<arglist_t> ikt_args = {
 };

diff --git a/inifile.cc b/inifile.cc
index e529f86f5f6229be1a51e9fad2fe1f90c767e589..4f22fdce3ce095d5199932c207f02c3c5a9b988a 100644 (file)
--- a/inifile.cc
+++ b/inifile.cc
@@ -21,16 +21,16 @@
 #include "defs.h"              // for fatal, ugetenv, warning
 #include "inifile.h"
 #include "src/core/file.h"     // for File
-#include <QtCore/QByteArray>   // for QByteArray
-#include <QtCore/QChar>        // for operator==, QChar
-#include <QtCore/QDir>         // for QDir
-#include <QtCore/QFile>        // for QFile
-#include <QtCore/QFileInfo>    // for QFileInfo
-#include <QtCore/QHash>        // for QHash
-#include <QtCore/QIODevice>    // for QIODevice::ReadOnly, QIODevice
-#include <QtCore/QTextStream>  // for QTextStream
-#include <QtCore/Qt>           // for CaseInsensitive
-#include <QtCore/QtGlobal>     // for qPrintable
+#include <QByteArray>          // for QByteArray
+#include <QChar>               // for operator==, QChar
+#include <QDir>                // for QDir
+#include <QFile>               // for QFile
+#include <QFileInfo>           // for QFileInfo
+#include <QHash>               // for QHash
+#include <QIODevice>           // for QIODevice::ReadOnly, QIODevice
+#include <QTextStream>         // for QTextStream
+#include <Qt>                  // for CaseInsensitive
+#include <QtGlobal>            // for qPrintable
 #include <utility>
 
 #define MYNAME "inifile"

diff --git a/inifile.h b/inifile.h
index 5706775af150e4e6cbf64ada38248ec9d3f509ba..e1aa6afd4a3cdf6ffce9df0c92634dd38587527d 100644 (file)
--- a/inifile.h
+++ b/inifile.h
@@ -21,9 +21,9 @@
 #ifndef HAVE_INIFILE_H
 #define HAVE_INIFILE_H
 
-#include <QtCore/QHash>    // for QHash
-#include <QtCore/QList>    // for QList
-#include <QtCore/QString>  // for QString
+#include <QHash>           // for QHash
+#include <QList>           // for QList
+#include <QString>         // for QString
 
 class InifileSection;
 struct inifile_t {

diff --git a/internal_styles.cc b/internal_styles.cc
index d89785ffb854930533f5aa2ebda0b171da51c12a..81ce883da791fdf1873c5dd5b725e404fc312938 100644 (file)
--- a/internal_styles.cc
+++ b/internal_styles.cc
@@ -1,7 +1,7 @@
 /* This file is machine-generated from the contents of style/ */
 /* by mkstyle.sh.   Editing it by hand is an exceedingly bad idea. */
 
-#include <QtCore/QVector>
+#include <QVector>
 #include "defs.h"
 #if CSVFMTS_ENABLED
 static char arc[] =

diff --git a/interpolate.cc b/interpolate.cc
index ad1232e794c3766907dfdcbdcb8af1c227d48478..8ebe34276a22e91eea306950fde7a02564ae4b89 100644 (file)
--- a/interpolate.cc
+++ b/interpolate.cc
@@ -24,8 +24,8 @@
 #include <cstdlib>              // for abs, atoi, strtod
 #include <optional>             // for optional
 
-#include <QtCore/QString>       // for QString
-#include <QtCore/QtGlobal>      // for qAsConst, QAddConst<>::Type
+#include <QString>              // for QString
+#include <QtGlobal>             // for qAsConst, QAddConst<>::Type
 
 #include "defs.h"
 #include "interpolate.h"

diff --git a/interpolate.h b/interpolate.h
index e2590228e66dd78b22faa989db89be21939404b0..99b3ea14771b74f43246a06a7941d3da2877fe71 100644 (file)
--- a/interpolate.h
+++ b/interpolate.h
@@ -24,8 +24,8 @@
 
 #include <optional>             // for optional
 
-#include <QtCore/QVector>       // for QVector
-#include <QtCore/QtGlobal>      // for qint64
+#include <QVector>              // for QVector
+#include <QtGlobal>             // for qint64
 
 #include "defs.h"               // for ARG_NOMINMAX, arglist_t, ARGTYPE_BEGIN_EXCL, ARG...
 #include "filter.h"             // for Filter

diff --git a/itracku.cc b/itracku.cc
index fe4d08f2d9d6d33f60b18f2f7f31bf892b6782ef..1f85397e7ff4ef4ac9e1ba72fc6cc4eb6f026cc1 100644 (file)
--- a/itracku.cc
+++ b/itracku.cc
@@ -36,13 +36,13 @@
 #include <cstring>                 // for memcpy, strcmp, strlen, strncmp
 #include <ctime>                   // for gmtime
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QDate>            // for QDate
-#include <QtCore/QDateTime>        // for QDateTime
-#include <QtCore/QString>          // for QString
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/Qt>               // for UTC
-#include <QtCore/QtGlobal>         // for qPrintable
+#include <QByteArray>              // for QByteArray
+#include <QDate>                   // for QDate
+#include <QDateTime>               // for QDateTime
+#include <QString>                 // for QString
+#include <QTime>                   // for QTime
+#include <Qt>                      // for UTC
+#include <QtGlobal>                // for qPrintable
 
 #include "defs.h"
 #include "gbser.h"                 // for gbser_read_line, gbser_write, gbser_deinit, gbser_flush, gbser_init, gbser_is_serial, gbser_read_wait, gbser_ERROR, gbser_OK
@@ -276,7 +276,7 @@ decode_itracku_time(uint32_t date)
   int day = (date >> 17) & 31;
   int month = ((date >> 22) & 15);
   int year = ((date >> 26) & 63) + 2000;
-  QDate qdate(year, month, day); 
+  QDate qdate(year, month, day);
 
   return QDateTime(qdate, qtime, Qt::UTC);
 }

diff --git a/jeeps/gpsapp.cc b/jeeps/gpsapp.cc
index 6390cbce7c62ed19c07d3d22a46ba075a8ce4403..fcfbead3936836353a399527f95e10140c058466 100644 (file)
--- a/jeeps/gpsapp.cc
+++ b/jeeps/gpsapp.cc
@@ -30,7 +30,7 @@
 #include <cstring>
 #include <ctime>
 
-#include <QtCore/QDateTime>
+#include <QDateTime>
 
 /*
  * This violates the layering design, but is needed for device discovery.
@@ -329,7 +329,7 @@ static int32 GPS_A000(const char* port)
 
         // Garmin 276C serial - not USB - sees a zero here, so we changed
         // <= 0 to <0 on 2014-06-29 per Pierre Brial.
-         
+
         if (GPS_Packet_Read(fd, &rec) < 0) {
           goto carry_on;
         }
@@ -7590,7 +7590,7 @@ int32 GPS_Set_Baud_Rate(const char* port, int br)
 {
 
   gpsdevh* fd;
-  
+
   if (!GPS_Device_On(port, &fd)) {
     return gps_errno;
   }
@@ -7601,7 +7601,7 @@ int32 GPS_Set_Baud_Rate(const char* port, int br)
   if (!GPS_Device_Off(fd)) {
     return gps_errno;
   }
-  
+
   return 0;
 
 }

diff --git a/jeeps/gpsserial.cc b/jeeps/gpsserial.cc
index 5aee770da9c293cc1a0bd683391840d23741f9ea..4bbd488d52f20127357e2a9eb855c53965dea7c7 100644 (file)
--- a/jeeps/gpsserial.cc
+++ b/jeeps/gpsserial.cc
@@ -26,7 +26,7 @@
 #include "jeeps/gps.h"
 #include "gbser.h"
 #include "jeeps/gpsserial.h"
-#include <QtCore/QThread>
+#include <QThread>
 #include <cerrno>
 #include <cstdio>
 #include <ctime>

diff --git a/jeeps/gpsusbread.cc b/jeeps/gpsusbread.cc
index 5b6cc996de39b315d127c80e6b37c36d06e50b9d..97bb7c035f5466da6e624c9780680cf597760cce 100644 (file)
--- a/jeeps/gpsusbread.cc
+++ b/jeeps/gpsusbread.cc
@@ -75,7 +75,7 @@ do_over:
    * haven't been observed so far.
    * 484 = Forerunner 305
    * 450 = Edge 205, confirmed with Ian Dent on 2015/11/16.
-   * All Edge, Forerunner, and Foretracker [23]05 are probably 
+   * All Edge, Forerunner, and Foretracker [23]05 are probably
    * similarly affected, but we don't know their device ID.
    */
   if ((gps_save_id == 484 || gps_save_id == 450)

diff --git a/jogmap.cc b/jogmap.cc
index 1cc32640043c292827fbabb33349b5b1d6c15293..e590a419fce69cd6be45d245a91d5c6c35e6bc83 100644 (file)
--- a/jogmap.cc
+++ b/jogmap.cc
@@ -25,7 +25,7 @@
 #include "garmin_tables.h"
 #include "jeeps/gpsmath.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 
 static route_head* trk;
 

diff --git a/jtr.cc b/jtr.cc
index fd5167ec6566b4ab413e489c3074ad53b9ebfb1e..6d507f3acf4efdfe7fdd04838a05df49123f7d34 100644 (file)
--- a/jtr.cc
+++ b/jtr.cc
@@ -21,7 +21,7 @@
  */
 #include "defs.h"
 #include "csv_util.h"
-#include <QtCore/QHash>
+#include <QHash>
 //#include <cassert>
 #include <cmath>
 #include <cstdio>

diff --git a/kml.cc b/kml.cc
index 48aa830c076e5d8477cccd71ddc61d492c452da1..8112d456ba14ca094094f76d87eccf09df1a359d 100644 (file)
--- a/kml.cc
+++ b/kml.cc
@@ -28,20 +28,20 @@
 #include <optional>                     // for optional
 #include <tuple>                        // for tuple, make_tuple, tie
 
-#include <QtCore/QByteArray>            // for QByteArray
-#include <QtCore/QChar>                 // for QChar
-#include <QtCore/QDate>                 // for QDate
-#include <QtCore/QDateTime>             // for QDateTime
-#include <QtCore/QFile>                 // for QFile
-#include <QtCore/QIODevice>             // for operator|, QIODevice, QIODevice::Text, QIODevice::WriteOnly
-#include <QtCore/QList>                 // for QList
-#include <QtCore/QStaticStringData>     // for QStaticStringData
-#include <QtCore/QString>               // for QString, QStringLiteral, operator+, operator!=
-#include <QtCore/QStringList>           // for QStringList
-#include <QtCore/QVector>               // for QVector
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/Qt>                    // for ISODate
-#include <QtCore/QtGlobal>              // for foreach, qint64, qPrintable
+#include <QByteArray>                   // for QByteArray
+#include <QChar>                        // for QChar
+#include <QDate>                        // for QDate
+#include <QDateTime>                    // for QDateTime
+#include <QFile>                        // for QFile
+#include <QIODevice>                    // for operator|, QIODevice, QIODevice::Text, QIODevice::WriteOnly
+#include <QList>                        // for QList
+#include <QStaticStringData>            // for QStaticStringData
+#include <QString>                      // for QString, QStringLiteral, operator+, operator!=
+#include <QStringList>                  // for QStringList
+#include <QVector>                      // for QVector
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <Qt>                           // for ISODate
+#include <QtGlobal>                     // for foreach, qint64, qPrintable
 
 #include "defs.h"
 #include "kml.h"

diff --git a/kml.h b/kml.h
index bfa993e4c332c56feebd254b00ece15e57302d06..d324b167f116ed9c1d5a15fb95ddba8122f6ca93 100644 (file)
--- a/kml.h
+++ b/kml.h
@@ -24,10 +24,10 @@
 
 #include <tuple>                        // for tuple, make_tuple, tie
 
-#include <QtCore/QList>                 // for QList
-#include <QtCore/QString>               // for QString, QStringLiteral, operator+, operator!=
-#include <QtCore/QVector>               // for QVector
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QList>                        // for QList
+#include <QString>                      // for QString, QStringLiteral, operator+, operator!=
+#include <QVector>                      // for QVector
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "format.h"

diff --git a/lmx.cc b/lmx.cc
index 2ed8186db42a63420fb118ef2e130921c0c76c74..a8164f3b744230efa6ed0fd3ea2cd1ba5b859683 100644 (file)
--- a/lmx.cc
+++ b/lmx.cc
@@ -26,8 +26,8 @@
  * we don't implement that at this time in GPSBabel.
  */
 
-#include <QtCore/QString>               // for QString
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QString>                      // for QString
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "gbfile.h"                     // for gbfputc, gbfprintf, gbfclose, gbfopen, gbfputcstr, gbfputs, gbfile, gbfputuint16

diff --git a/lowranceusr.cc b/lowranceusr.cc
index a4244d51ab25fac5640474b713407d0d62b6cc84..8d816bb37f92ae61f74513f6168e22442ecb1953 100644 (file)
--- a/lowranceusr.cc
+++ b/lowranceusr.cc
@@ -92,18 +92,18 @@
 #include <cstring>                // for strcmp, strlen
 #include <ctime>                  // for time_t
 
-#include <QtCore/QByteArray>      // for QByteArray
-#include <QtCore/QDate>           // for QDate
-#include <QtCore/QDateTime>       // for QDateTime
-#include <QtCore/QLatin1String>   // for QLatin1String
-#include <QtCore/QList>           // for QList
-#include <QtCore/QScopedPointer>  // for QScopedPointer
-#include <QtCore/QString>         // for QString, operator+, operator==, operator!=
-#include <QtCore/QTextCodec>      // for QTextCodec, QTextCodec::IgnoreHeader
-#include <QtCore/QTextEncoder>    // for QTextEncoder
-#include <QtCore/QTime>           // for QTime
-#include <QtCore/Qt>              // for CaseInsensitive, UTC
-#include <QtCore/QtGlobal>        // for qPrintable, uint, qAsConst, QAddConst<>::Type
+#include <QByteArray>             // for QByteArray
+#include <QDate>                  // for QDate
+#include <QDateTime>              // for QDateTime
+#include <QLatin1String>          // for QLatin1String
+#include <QList>                  // for QList
+#include <QScopedPointer>         // for QScopedPointer
+#include <QString>                // for QString, operator+, operator==, operator!=
+#include <QTextCodec>             // for QTextCodec, QTextCodec::IgnoreHeader
+#include <QTextEncoder>           // for QTextEncoder
+#include <QTime>                  // for QTime
+#include <Qt>                     // for CaseInsensitive, UTC
+#include <QtGlobal>               // for qPrintable, uint, qAsConst, QAddConst<>::Type
 
 #include "defs.h"
 #include "lowranceusr.h"

diff --git a/lowranceusr.h b/lowranceusr.h
index 3f2bfc495557a454ab6b989aba56d308257fc437..ce082b7207ffb607906a3647199d3f916a840af1 100644 (file)
--- a/lowranceusr.h
+++ b/lowranceusr.h
@@ -90,12 +90,12 @@
 #include <cmath>                  // for M_PI, round, atan, exp, log, tan
 #include <ctime>                  // for time_t
 
-#include <QtCore/QList>         // for QList
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTextCodec>    // for QTextCodec
-#include <QtCore/QVector>       // for QVector
-#include <QtCore/Qt>            // for CaseInsensitive
-#include <QtCore/QtGlobal>      // for uint
+#include <QList>                // for QList
+#include <QString>              // for QString
+#include <QTextCodec>           // for QTextCodec
+#include <QVector>              // for QVector
+#include <Qt>                   // for CaseInsensitive
+#include <QtGlobal>             // for uint
 
 #include "defs.h"
 #include "format.h"

diff --git a/magellan.h b/magellan.h
index 4a2b7aec3242a4c9ac1fd1ad8b960b779c13c31a..67f06262548e84e43441f7ef77bf91f07a81f1f4 100644 (file)
--- a/magellan.h
+++ b/magellan.h
@@ -20,7 +20,7 @@
 #ifndef MAGELLAN_H_INCLUDED_
 #define MAGELLAN_H_INCLUDED_
 
-#include <QtCore/QString>
+#include <QString>
 #include "defs.h"
 
 /*

diff --git a/maggeo.cc b/maggeo.cc
index 004dc9964a79e55ec9f0d63b357775537fd85df7..f1b199ccdc45408d865e2a2f8f63198d75cc15cf 100644 (file)
--- a/maggeo.cc
+++ b/maggeo.cc
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "csv_util.h"
 #include "magellan.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>

diff --git a/magproto.cc b/magproto.cc
index bbd84d53908a595c69fea38d2ae5f5537d2febe2..ed707aec18c78bd239fcef7f43bf92d03cd3e8b9 100644 (file)
--- a/magproto.cc
+++ b/magproto.cc
@@ -27,20 +27,20 @@
 #include <cstdlib>                 // for atoi, atof, strtoul
 #include <cstring>                 // for strchr, strncmp, strlen, memmove, strrchr, memset
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QDateTime>        // for QDateTime
-#include <QtCore/QDir>             // for QDir, operator|, QDir::Files, QDir::Name, QDir::Readable
-#include <QtCore/QFileInfo>        // for QFileInfo
-#include <QtCore/QFileInfoList>    // for QFileInfoList
-#include <QtCore/QLatin1String>    // for QLatin1String
-#include <QtCore/QList>            // for QList
-#include <QtCore/QScopedPointer>   // for QScopedPointer
-#include <QtCore/QString>          // for QString, operator==
-#include <QtCore/QStringList>      // for QStringList
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
-#include <QtCore/QtGlobal>         // for qPrintable, foreach
+#include <QByteArray>              // for QByteArray
+#include <QDateTime>               // for QDateTime
+#include <QDir>                    // for QDir, operator|, QDir::Files, QDir::Name, QDir::Readable
+#include <QFileInfo>               // for QFileInfo
+#include <QFileInfoList>           // for QFileInfoList
+#include <QLatin1String>           // for QLatin1String
+#include <QList>                   // for QList
+#include <QScopedPointer>          // for QScopedPointer
+#include <QString>                 // for QString, operator==
+#include <QStringList>             // for QStringList
+#include <QTime>                   // for QTime
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
+#include <QtGlobal>                // for qPrintable, foreach
 
 #include "defs.h"
 #include "explorist_ini.h"         // for explorist_ini_done, explorist_ini_get, mag_info
@@ -1409,7 +1409,7 @@ void mag_track_disp(const Waypoint* waypointp)
 
   double ilat = waypointp->latitude;
   double ilon = waypointp->longitude;
-  
+
   QByteArray dmy("");
   QByteArray hms("");
   if (waypointp->creation_time.isValid()) {

diff --git a/main.cc b/main.cc
index 8847115f3e844dfe0533fe6b813030c2870822ea..c3d2aa490fdbcff750995b3d815a581b238daebd 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -22,21 +22,21 @@
 #include <cstdio>                     // for printf, fflush, fgetc, fprintf, stderr, stdin, stdout
 #include <cstring>                    // for strcmp
 
-#include <QtCore/QByteArray>          // for QByteArray
-#include <QtCore/QChar>               // for QChar
-#include <QtCore/QCoreApplication>    // for QCoreApplication
-#include <QtCore/QFile>               // for QFile
-#include <QtCore/QIODevice>           // for QIODevice::ReadOnly
-#include <QtCore/QLocale>             // for QLocale
-#include <QtCore/QMessageLogContext>  // for QMessageLogContext
-#include <QtCore/QStack>              // for QStack
-#include <QtCore/QString>             // for QString
-#include <QtCore/QStringList>         // for QStringList
-#include <QtCore/QSysInfo>            // for QSysInfo
-#include <QtCore/QTextCodec>          // for QTextCodec
-#include <QtCore/QTextStream>         // for QTextStream
-#include <QtCore/QtConfig>            // for QT_VERSION_STR
-#include <QtCore/QtGlobal>            // for qPrintable, qVersion, QT_VERSION, QT_VERSION_CHECK
+#include <QByteArray>                 // for QByteArray
+#include <QChar>                      // for QChar
+#include <QCoreApplication>           // for QCoreApplication
+#include <QFile>                      // for QFile
+#include <QIODevice>                  // for QIODevice::ReadOnly
+#include <QLocale>                    // for QLocale
+#include <QMessageLogContext>         // for QMessageLogContext
+#include <QStack>                     // for QStack
+#include <QString>                    // for QString
+#include <QStringList>                // for QStringList
+#include <QSysInfo>                   // for QSysInfo
+#include <QTextCodec>                 // for QTextCodec
+#include <QTextStream>                // for QTextStream
+#include <QtConfig>                   // for QT_VERSION_STR
+#include <QtGlobal>                   // for qPrintable, qVersion, QT_VERSION, QT_VERSION_CHECK
 
 #ifdef AFL_INPUT_FUZZING
 #include "argv-fuzz-inl.h"
@@ -231,7 +231,7 @@ public:
              qPrintable(wpt->shortname),
              qPrintable(wpt->description));
     }
-  
+
     if (wpt->altitude != unknown_alt) {
       printf(" %f", wpt->altitude);
     }

diff --git a/mapasia.cc b/mapasia.cc
index baaa5b718fb6788aaec6f65e32e16db579782d71..42c350701e7fdfeeddb2248bd399230c75685881 100644 (file)
--- a/mapasia.cc
+++ b/mapasia.cc
@@ -23,12 +23,12 @@
 #include <cmath>                // for fabs
 #include <cstring>              // for memset
 
-#include <QtCore/QDate>         // for QDate
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/Qt>            // for UTC
-#include <QtCore/QtGlobal>      // for foreach
+#include <QDate>                // for QDate
+#include <QDateTime>            // for QDateTime
+#include <QString>              // for QString
+#include <QTime>                // for QTime
+#include <Qt>                   // for UTC
+#include <QtGlobal>             // for foreach
 
 #include "defs.h"
 #include "gbfile.h"             // for gbfclose, gbfeof, gbfgetint32, gbfputint32, gbfread, gbfwrite, gbfile, gbfopen_le

diff --git a/mapbar_track.cc b/mapbar_track.cc
index 3efc4fd88bd5f5b1bb33270a4181382c99d67ad1..be272179ce09462810f6d411f9272836416cbb78 100644 (file)
--- a/mapbar_track.cc
+++ b/mapbar_track.cc
@@ -23,11 +23,11 @@
 
 #include <cstdio>               // for SEEK_CUR
 
-#include <QtCore/QChar>         // for QChar
-#include <QtCore/QDate>         // for QDate
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/QVector>       // for QVector
+#include <QChar>                // for QChar
+#include <QDate>                // for QDate
+#include <QString>              // for QString
+#include <QTime>                // for QTime
+#include <QVector>              // for QVector
 
 #include "defs.h"
 #include "gbfile.h"             // for gbfgetint16, gbfgetint32, gbfseek, gbfclose, gbfopen, gbfile

diff --git a/mapfactor.cc b/mapfactor.cc
index 5aa1e590f9555bfe1c78a274490d2ad059949515..4611eae9828ba3a6fea519479e7cc6cdffe713d9 100644 (file)
--- a/mapfactor.cc
+++ b/mapfactor.cc
@@ -19,9 +19,9 @@
 #include "defs.h"
 #include "src/core/file.h"
 #include "src/core/xmlstreamwriter.h"
-#include <QtCore/QDebug>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
+#include <QDebug>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 static gpsbabel::File* oqfile;
 static QXmlStreamWriter* writer;

diff --git a/mapsend.cc b/mapsend.cc
index d529f34d09a5dcfbf904fb52f524715cdf867b16..055541b24341c21ecc3e7ea065d115028b39ea7d 100644 (file)
--- a/mapsend.cc
+++ b/mapsend.cc
@@ -24,10 +24,10 @@
 #include <cstring>              // for strncpy
 #include <ctime>
 
-#include <QtCore/QCharRef>      // for QCharRef
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/QtGlobal>      // for Q_UNUSED
+#include <QCharRef>             // for QCharRef
+#include <QString>              // for QString
+#include <QTime>                // for QTime
+#include <QtGlobal>             // for Q_UNUSED
 
 #include "defs.h"
 #include "mapsend.h"

diff --git a/mkicondoc.cc b/mkicondoc.cc
index dea1433748ad0242ff411e7bb066717bd111e3f6..afeb6f73a08f46b1ca22c7c6a861aebbaf7c01c7 100644 (file)
--- a/mkicondoc.cc
+++ b/mkicondoc.cc
@@ -6,7 +6,7 @@
 #include <cstdio>                // for printf
 #include <cstring>               // for strcmp
 
-#include <QtCore/QVector>        // for QVector<>::iterator, QVector
+#include <QVector>               // for QVector<>::iterator, QVector
 
 #include "garmin_icon_tables.h"  // for garmin_icon_table, garmin_smart_icon_table
 #include "garmin_tables.h"       // for icon_mapping_t
@@ -21,7 +21,7 @@ int main()
   for (const icon_mapping_t* entry = garmin_smart_icon_table; entry->icon; entry++) {
     table.append(*entry);
   }
-  
+
   auto sort_lambda = [](const icon_mapping_t& a, const icon_mapping_t& b)->bool {
     return strcmp(a.icon, b.icon) < 0;
   };

diff --git a/mkshort.cc b/mkshort.cc
index e29dc08081c48dba8fd63a4175c16360294ae610..3936b813d8b6cf60be26dd811ea729c8b23a0d0f 100644 (file)
--- a/mkshort.cc
+++ b/mkshort.cc
@@ -23,9 +23,9 @@
 #include <cstdio>           // for sprintf, size_t
 #include <cstring>          // for strlen, memmove, strchr, strcpy, strncmp, strcat, strncpy
 
-#include <QtCore/QList>     // for QList
-#include <QtCore/QString>   // for QString
-#include <QtCore/QtGlobal>  // for foreach
+#include <QList>            // for QList
+#include <QString>          // for QString
+#include <QtGlobal>         // for foreach
 
 #include "defs.h"
 #include "cet.h"            // for cet_utf8_strdup, cet_utf8_strlen, cet_utf8_strndup

diff --git a/mkstyle.sh b/mkstyle.sh
index af821b0d1d4333642c95fd409a842603e9df0d53..68509f96ce3c810e986d1abddcae488cb90863d1 100755 (executable)
--- a/mkstyle.sh
+++ b/mkstyle.sh
@@ -2,7 +2,7 @@
 
 echo "/* This file is machine-generated from the contents of style/ */"
 echo "/* by mkstyle.sh.   Editing it by hand is an exceedingly bad idea. */"
-echo 
+echo
 
 # set the locale for sorting so that the collate order doesn't depend
 # on the users environment.
@@ -30,7 +30,7 @@ else
   exit 1
 fi
 
-echo "#include <QtCore/QVector>"
+echo "#include <QVector>"
 echo "#include \"defs.h\""
 echo "#if CSVFMTS_ENABLED"
 for i in "$(dirname "$0")"/style/*.style

diff --git a/mmo.cc b/mmo.cc
index 9e91e16a170ec22fcb6682d66919282d631c75ca..a5d693f3607fd615b8f9f30f4befbd5265a2dc0b 100644 (file)
--- a/mmo.cc
+++ b/mmo.cc
@@ -29,19 +29,19 @@
 #include <cstring>               // for strcmp, strlen, memset, strchr, strncmp
 #include <ctime>
 
-#include <QtCore/QByteArray>     // for QByteArray
-#include <QtCore/QChar>          // for operator==, QChar
-#include <QtCore/QCharRef>       // for QCharRef
-#include <QtCore/QDateTime>      // for QDateTime
-#include <QtCore/QHash>          // for QHash, QHash<>::const_iterator
-#include <QtCore/QLatin1String>  // for QLatin1String
-#include <QtCore/QScopedPointer> // for QScopedPointer
-#include <QtCore/QString>        // for QString, operator==
-#include <QtCore/QTextCodec>     // for QTextCodec, QTextCodec::IgnoreHeader
-#include <QtCore/QTextEncoder>   // for QTextEncoder
-#include <QtCore/QVector>        // for QVector
-#include <QtCore/Qt>             // for CaseInsensitive
-#include <QtCore/QtGlobal>       // for qAsConst, QAddConst<>::Type, foreach, Q_UNUSED
+#include <QByteArray>            // for QByteArray
+#include <QChar>                 // for operator==, QChar
+#include <QCharRef>              // for QCharRef
+#include <QDateTime>             // for QDateTime
+#include <QHash>                 // for QHash, QHash<>::const_iterator
+#include <QLatin1String>         // for QLatin1String
+#include <QScopedPointer>        // for QScopedPointer
+#include <QString>               // for QString, operator==
+#include <QTextCodec>            // for QTextCodec, QTextCodec::IgnoreHeader
+#include <QTextEncoder>          // for QTextEncoder
+#include <QVector>               // for QVector
+#include <Qt>                    // for CaseInsensitive
+#include <QtGlobal>              // for qAsConst, QAddConst<>::Type, foreach, Q_UNUSED
 
 #include "defs.h"
 #include "gbfile.h"              // for gbfputc, gbfgetuint16, gbfgetc, gbfgetdbl, gbfgetuint32, gbfputflt, gbfputuint32, gbfgetint16, gbfputdbl, gbfputuint16, gbfclose, gbfread, gbfseek, gbfputint16, gbfwrite, gbfcopyfrom, gbfeof, gbfgetflt, gbfgetint32, gbfile, gbfopen, gbfrewind, gbsize_t

diff --git a/mtk_logger.cc b/mtk_logger.cc
index 6a36421bc89eaf24c20a5c60a36f535111eab33d..af4ead85445710a2427d20fcb5a293859a2b6cc7 100644 (file)
--- a/mtk_logger.cc
+++ b/mtk_logger.cc
@@ -57,9 +57,9 @@
 #include "defs.h"
 #include "gbfile.h" /* used for csv output */
 #include "gbser.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QThread>
+#include <QDir>
+#include <QFile>
+#include <QThread>
 #include <cerrno>
 #include <cmath>
 #include <cstdlib>

diff --git a/mynav.cc b/mynav.cc
index 9643daeea29a7ed02db1c6537c5eaa087f5aebb3..f2fbf982ead1dd5807fd2cabe986cb86e37772d6 100644 (file)
--- a/mynav.cc
+++ b/mynav.cc
@@ -23,12 +23,12 @@
 
  */
 
-#include <QtCore/QChar>
-#include <QtCore/QDebug>
-#include <QtCore/QIODevice>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QtGlobal>
+#include <QChar>
+#include <QDebug>
+#include <QIODevice>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
 
 #include <src/core/textstream.h>
 

diff --git a/mynav.h b/mynav.h
index 7276fe4c670f4f6e60d9c7fe7aa9e9186a60ee66..998d4bf9574cd2755266d38079ede6b1b76d7ba2 100644 (file)
--- a/mynav.h
+++ b/mynav.h
@@ -23,8 +23,8 @@
 #ifndef MYNAV_H_INCLUDED_
 #define MYNAV_H_INCLUDED_
 
-#include <QtCore/QString>
-#include <QtCore/QVector>
+#include <QString>
+#include <QVector>
 
 #include "defs.h"
 #include "format.h"

diff --git a/navicache.cc b/navicache.cc
index 6ffb0f36836965a3cbbe21048a141cdeed4514e3..41aa365f7fdffcf8c246e2c338e07068c094ab20 100644 (file)
--- a/navicache.cc
+++ b/navicache.cc
@@ -19,7 +19,7 @@
 #include "defs.h"
 #include "cet_util.h"
 #include "src/core/file.h"
-#include <QtCore/QXmlStreamReader>
+#include <QXmlStreamReader>
 
 static char* noretired = nullptr;
 static QString read_fname;

diff --git a/navilink.cc b/navilink.cc
index 6ca53362b6935290bea926807ba59889421326a2..739ae123d2bf7b75f21a04fce2294842fad9f52c 100644 (file)
--- a/navilink.cc
+++ b/navilink.cc
@@ -26,7 +26,7 @@
 #include "gbser.h"
 #include "jeeps/gpsmath.h"
 #include "navilink.h"
-#include <QtCore/QThread>
+#include <QThread>
 
 #define MYNAME "NAVILINK"
 

diff --git a/nmea.cc b/nmea.cc
index c9d793fd9901eb1cee4e40404513ffdd7a9ffe35..733e9967ba61d03c5f440e77f03f7f7220bff7c5 100644 (file)
--- a/nmea.cc
+++ b/nmea.cc
@@ -27,18 +27,18 @@
 #include <cstring>                 // for strncmp, strchr, strlen, strstr, memset, strrchr
 #include <iterator>                // for operator!=, reverse_iterator
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QChar>            // for QChar, operator==, operator!=
-#include <QtCore/QDateTime>        // for QDateTime
-#include <QtCore/QDebug>           // for QDebug
-#include <QtCore/QList>            // for QList
-#include <QtCore/QString>          // for QString
-#include <QtCore/QStringList>      // for QStringList
-#include <QtCore/QTextStream>      // for hex
-#include <QtCore/QThread>          // for QThread
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/Qt>               // for UTC
-#include <QtCore/QtGlobal>         // for qPrintable, foreach
+#include <QByteArray>              // for QByteArray
+#include <QChar>                   // for QChar, operator==, operator!=
+#include <QDateTime>               // for QDateTime
+#include <QDebug>                  // for QDebug
+#include <QList>                   // for QList
+#include <QString>                 // for QString
+#include <QStringList>             // for QStringList
+#include <QTextStream>             // for hex
+#include <QThread>                 // for QThread
+#include <QTime>                   // for QTime
+#include <Qt>                      // for UTC
+#include <QtGlobal>                // for qPrintable, foreach
 
 #include "defs.h"
 #include "nmea.h"
@@ -643,7 +643,7 @@ NmeaFormat::gpgsa_parse(const QString& ibuf) const
     fix = fields[2][0];
   }
 
-  // 12 fields, index 3 through 14. 
+  // 12 fields, index 3 through 14.
   for (int cnt = 0; cnt <= 11; cnt++) {
     if (nfields > cnt + 3) prn[cnt] = fields[cnt + 3].toInt();
   }

diff --git a/nmea.h b/nmea.h
index 3da5acf606ed53a1fe0399734401556bf10b16ce..df91ca9215bedc11d2517e621054479057d05f54 100644 (file)
--- a/nmea.h
+++ b/nmea.h
@@ -22,13 +22,13 @@
 #ifndef NMEA_H_INCLUDED_
 #define NMEA_H_INCLUDED_
 
-#include <QtCore/QByteArray>  // for QByteArray
-#include <QtCore/QDate>       // for QDate
-#include <QtCore/QDateTime>   // for QDateTime
-#include <QtCore/QList>       // for QList
-#include <QtCore/QString>     // for QString
-#include <QtCore/QTime>       // for QTime
-#include <QtCore/QVector>     // for QVector
+#include <QByteArray>         // for QByteArray
+#include <QDate>              // for QDate
+#include <QDateTime>          // for QDateTime
+#include <QList>              // for QList
+#include <QString>            // for QString
+#include <QTime>              // for QTime
+#include <QVector>            // for QVector
 
 #include "defs.h"
 #include "format.h"           // for Format

diff --git a/nukedata.h b/nukedata.h
index 30ee59715bd483d0a7c8552609b8795bdaf97de6..ec05dd64e562730cc1b6061abe20da40d91b9dc5 100644 (file)
--- a/nukedata.h
+++ b/nukedata.h
@@ -23,7 +23,7 @@
 #ifndef NUKEDATA_H_INCLUDED_
 #define NUKEDATA_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI...
 #include "filter.h"  // for Filter

diff --git a/osm.cc b/osm.cc
index 92e00012389fb22a0525593fb80c2db3fd3710f6..30b85a2b2dfd48308c4228e417bd2747f474a87a 100644 (file)
--- a/osm.cc
+++ b/osm.cc
@@ -22,13 +22,13 @@
 
 #include <cstring>                      // for strlen, strchr, strcmp
 
-#include <QtCore/QByteArray>            // for QByteArray
-#include <QtCore/QHash>                 // for QHash
-#include <QtCore/QLatin1String>         // for QLatin1String
-#include <QtCore/QPair>                 // for QPair, operator==
-#include <QtCore/QString>               // for QString, operator==, operator+
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/QtGlobal>              // for qPrintable, QAddConst<>::Type
+#include <QByteArray>                   // for QByteArray
+#include <QHash>                        // for QHash
+#include <QLatin1String>                // for QLatin1String
+#include <QPair>                        // for QPair, operator==
+#include <QString>                      // for QString, operator==, operator+
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <QtGlobal>                     // for qPrintable, QAddConst<>::Type
 
 #include "defs.h"
 #include "osm.h"

diff --git a/osm.h b/osm.h
index 609a0f419cc584c60c8c3b6ed06f23879997286c..89996399b6373d27daac7b5bd3947efa9ddf3221 100644 (file)
--- a/osm.h
+++ b/osm.h
@@ -22,12 +22,12 @@
 #ifndef OSM_H_INCLUDED_
 #define OSM_H_INCLUDED_
 
-#include <QtCore/QHash>                 // for QHash
-#include <QtCore/QList>                 // for QList
-#include <QtCore/QPair>                 // for QPair
-#include <QtCore/QString>               // for QString
-#include <QtCore/QVector>               // for QVector
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QHash>                        // for QHash
+#include <QList>                        // for QList
+#include <QPair>                        // for QPair
+#include <QString>                      // for QString
+#include <QVector>                      // for QVector
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "format.h"                     // for Format

diff --git a/ozi.cc b/ozi.cc
index 4c30584094f429eda1c9ea1fc9c30a773b275ea2..d934bd8d05c15e4dc963cf7ee3fd4c87fe96e29b 100644 (file)
--- a/ozi.cc
+++ b/ozi.cc
@@ -40,18 +40,18 @@
 #include <cmath>                  // for lround
 #include <cstdlib>                // for atoi
 
-#include <QtCore/QByteArray>      // for QByteArray
-#include <QtCore/QChar>           // for operator==, QChar
-#include <QtCore/QCharRef>        // for QCharRef
-#include <QtCore/QFile>           // for QFile
-#include <QtCore/QFileInfo>       // for QFileInfo
-#include <QtCore/QIODevice>       // for operator|, QIODevice::WriteOnly, QIODevice::ReadOnly, QIODevice, QIODevice::OpenModeFlag
-#include <QtCore/QString>         // for QString
-#include <QtCore/QStringList>     // for QStringList
-#include <QtCore/QTextStream>     // for QTextStream, operator<<, qSetRealNumberPrecision, QTextStream::FixedNotation
-#include <QtCore/QVector>         // for QVector
-#include <QtCore/Qt>              // for CaseInsensitive
-#include <QtCore/QtGlobal>        // for qPrintable
+#include <QByteArray>             // for QByteArray
+#include <QChar>                  // for operator==, QChar
+#include <QCharRef>               // for QCharRef
+#include <QFile>                  // for QFile
+#include <QFileInfo>              // for QFileInfo
+#include <QIODevice>              // for operator|, QIODevice::WriteOnly, QIODevice::ReadOnly, QIODevice, QIODevice::OpenModeFlag
+#include <QString>                // for QString
+#include <QStringList>            // for QStringList
+#include <QTextStream>            // for QTextStream, operator<<, qSetRealNumberPrecision, QTextStream::FixedNotation
+#include <QVector>                // for QVector
+#include <Qt>                     // for CaseInsensitive
+#include <QtGlobal>               // for qPrintable
 
 #include "defs.h"
 #include "csv_util.h"             // for csv_stringclean
@@ -263,7 +263,7 @@ ozi_openfile(const QString& fname)
   if (stream != nullptr) {
     ozi_close_io();
   }
- 
+
   ozi_open_io(tmpname, QFile::WriteOnly);
 }
 

diff --git a/pcx.cc b/pcx.cc
index 289e04f94a6bbb93494c22cb0ced1509fcd18147..e4a55e45ae4d2f56668469f447352f19f1c8d85d 100644 (file)
--- a/pcx.cc
+++ b/pcx.cc
@@ -23,17 +23,17 @@
 #include <cstdlib>                    // for atoi
 #include <cstring>                    // for strstr, strncmp
 
-#include <QtCore/QChar>               // for operator==, QChar
-#include <QtCore/QCharRef>            // for QCharRef
-#include <QtCore/QDate>               // for QDate
-#include <QtCore/QDateTime>           // for QDateTime
-#include <QtCore/QList>               // for QList
-#include <QtCore/QRegularExpression>  // for QRegularExpression
-#include <QtCore/QString>             // for QString, QString::SectionSkipEmpty
-#include <QtCore/QStringList>         // for QStringList
-#include <QtCore/QTime>               // for QTime
-#include <QtCore/QVector>             // for QVector
-#include <QtCore/Qt>                  // for CaseInsensitive, UTC
+#include <QChar>                      // for operator==, QChar
+#include <QCharRef>                   // for QCharRef
+#include <QDate>                      // for QDate
+#include <QDateTime>                  // for QDateTime
+#include <QList>                      // for QList
+#include <QRegularExpression>         // for QRegularExpression
+#include <QString>                    // for QString, QString::SectionSkipEmpty
+#include <QStringList>                // for QStringList
+#include <QTime>                      // for QTime
+#include <QVector>                    // for QVector
+#include <Qt>                         // for CaseInsensitive, UTC
 
 #include "defs.h"
 #include "cet_util.h"                 // for cet_convert_init

diff --git a/pocketfms_fp.cc b/pocketfms_fp.cc
index fbf6d0fa1c81c0620ef23039a3e28ef6fcf3a23e..79508f8d3bbe8197722b09245ecf9229a1ebec5d 100644 (file)
--- a/pocketfms_fp.cc
+++ b/pocketfms_fp.cc
@@ -19,8 +19,8 @@
 
  */
 
-#include <QtCore/QString>               // for QString
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QString>                      // for QString
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "xmlgeneric.h"                 // for cb_cdata, xg_callback, xg_string, cb_start, cb_end, xg_cb_type, xml_deinit, xml_init, xml_read, xg_tag_mapping

diff --git a/polygon.cc b/polygon.cc
index 629c0d5aa067219c70d87fbb2ec4500cfd412a8e..d2eae29a901bea64d5887f38ac2051d7b8695581 100644 (file)
--- a/polygon.cc
+++ b/polygon.cc
@@ -22,7 +22,7 @@
 #include <cstdio>           // for sscanf
 #include <cstring>          // for strchr, strlen, strspn
 
-#include <QtCore/QtGlobal>  // for foreach
+#include <QtGlobal>         // for foreach
 
 #include "defs.h"
 #include "polygon.h"

diff --git a/polygon.h b/polygon.h
index 78e529603bcc5eac13bb49ae3aab8af72abd7827..8849c1b96d6c7320b6be0398a035dbf7beefb0cd 100644 (file)
--- a/polygon.h
+++ b/polygon.h
@@ -22,7 +22,7 @@
 #ifndef POLYGON_H_INCLUDED_
 #define POLYGON_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARG_NOMINMAX, arglist_t, ARGTYPE_BOOL, ARGTYPE_FILE
 #include "filter.h"  // for Filter

diff --git a/position.cc b/position.cc
index f0200631760475f1395aa742b08f5e951ad462d3..bb372f956a534cfd210dc68c169a5648ba83b423 100644 (file)
--- a/position.cc
+++ b/position.cc
@@ -22,8 +22,8 @@
 #include <cmath>            // for fabs
 #include <cstdlib>          // for strtod
 
-#include <QtCore/QList>     // for QList
-#include <QtCore/QtGlobal>  // for qAsConst, QAddConst<>::Type
+#include <QList>            // for QList
+#include <QtGlobal>         // for qAsConst, QAddConst<>::Type
 
 #include "defs.h"
 #include "grtcirc.h"        // for RAD, gcdist, radtometers

diff --git a/position.h b/position.h
index dc9479e9025db655fe898af7a90e8d581d1b7717..a88348da15f968be37d7ebb114689a99d8a5aef7 100644 (file)
--- a/position.h
+++ b/position.h
@@ -22,7 +22,7 @@
 #ifndef POSITION_H_INCLUDED_
 #define POSITION_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for route_head (ptr only), ARG_NOMINMAX, ARGTYPE_FLOAT
 #include "filter.h"  // for Filter

diff --git a/qstarz_bl_1000.cc b/qstarz_bl_1000.cc
index f9a40db714baf9bc66eaeebc26114987f5d0db5a..ebd488f5e0907051c219657ef96217fc5a3255dc 100644 (file)
--- a/qstarz_bl_1000.cc
+++ b/qstarz_bl_1000.cc
@@ -26,11 +26,11 @@
 #include "qstarz_bl_1000.h"
 
 #include <cmath>               // for round
-#include <QtCore/QChar>        // for QChar
-#include <QtCore/QDataStream>  // for QDataStream, QDataStream::SinglePrecision, QDataStream::DoublePrecision, QDataStream::LittleEndian, QDataStream::Ok
-#include <QtCore/QDebug>       // for QDebug
-#include <QtCore/QFile>        // for QFile
-#include <QtCore/QIODevice>    // for QIODevice, QIODevice::ReadOnly
+#include <QChar>               // for QChar
+#include <QDataStream>         // for QDataStream, QDataStream::SinglePrecision, QDataStream::DoublePrecision, QDataStream::LittleEndian, QDataStream::Ok
+#include <QDebug>              // for QDebug
+#include <QFile>               // for QFile
+#include <QIODevice>           // for QIODevice, QIODevice::ReadOnly
 #include "defs.h"              // for Waypoint, ddmm2degrees, route_head, track_add_head, track_add_wpt, waypt_add, waypt_count, wp_flags, fix_unknown, fix_2d, fix_3d, fix_dgps, fix_none, fix_pps, fix_type, global_options, global_opts
 #include "src/core/logging.h"  // for Fatal
 

diff --git a/qstarz_bl_1000.h b/qstarz_bl_1000.h
index 695cd8314e5d77996a0115a2eedaed2581cf500f..b251efb517a20c03343d817c1c5047b4b5407676 100644 (file)
--- a/qstarz_bl_1000.h
+++ b/qstarz_bl_1000.h
@@ -26,10 +26,10 @@
 #ifndef QSTARZ_BL1000_H_INCLUDED_
 #define QSTARZ_BL1000_H_INCLUDED_
 
-#include <QtCore/QDataStream>  // for QDataStream
-#include <QtCore/QString>      // for QString
-#include <QtCore/QVector>      // for QVector
-#include <QtCore/QtGlobal>     // for qint8, quint16, quint8
+#include <QDataStream>         // for QDataStream
+#include <QString>             // for QString
+#include <QVector>             // for QVector
+#include <QtGlobal>            // for qint8, quint16, quint8
 
 #include "defs.h"              // for ff_cap, ff_cap_read, ff_cap_none, CET_CHARSET_ASCII, ff_type, ff_type_file, route_head
 #include "format.h"            // for Format

diff --git a/radius.cc b/radius.cc
index e71f2559414e08b665b86c7d69ee52fb87fa80be..c085336665a7455a7225b5019f5aa95b485df3f2 100644 (file)
--- a/radius.cc
+++ b/radius.cc
@@ -21,8 +21,8 @@
 
 #include <cstdlib>          // for atoi, strtod
 
-#include <QtCore/QString>   // for QString
-#include <QtCore/QtGlobal>  // for qAsConst, QAddConst<>::Type, foreach
+#include <QString>          // for QString
+#include <QtGlobal>         // for qAsConst, QAddConst<>::Type, foreach
 
 #include "defs.h"           // for Waypoint, waypt_del, route_add_head, route_add_wpt, route_head, waypt_add, waypt_count, xcalloc, xfree, kMilesPerKilometer
 #include "radius.h"

diff --git a/radius.h b/radius.h
index 5935c105a7c7f2996c08f4b26a6551b5dc1e03a8..41945eb85d335e84b1197c492d5c699b62c29a65 100644 (file)
--- a/radius.h
+++ b/radius.h
@@ -22,7 +22,7 @@
 #ifndef RADIUS_H_INCLUDED_
 #define RADIUS_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARG_NOMINMAX, ARGTYPE_FLOAT, ARGTYPE_REQUIRED
 #include "filter.h"  // for Filter

diff --git a/random.cc b/random.cc
index 5b1690eb7144371b45e128105e98ddb08e8b532a..0c3c049b789fe6800c857de16c3e5077733a60fc 100644 (file)
--- a/random.cc
+++ b/random.cc
@@ -21,11 +21,11 @@
 #include <cstdlib>              // for atoi
 #include <random>               // for mt19937
 
-#include <QtCore/QByteArray>    // for QByteArray
-#include <QtCore/QByteRef>      // for QByteRef
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QString>       // for QString
-#include <QtCore/QThread>       // for QThread
+#include <QByteArray>           // for QByteArray
+#include <QByteRef>             // for QByteRef
+#include <QDateTime>            // for QDateTime
+#include <QString>              // for QString
+#include <QThread>              // for QThread
 
 #include "defs.h"
 #include "random.h"

diff --git a/random.h b/random.h
index 0c53db0b3bd72d19a6e8189fae65c25141f5bb7e..53e5dd25d88e0b150d74117708f96a4ec4f2cc57 100644 (file)
--- a/random.h
+++ b/random.h
@@ -22,9 +22,9 @@
 
 #include <random>            // for mt19937
 
-#include <QtCore/QDateTime>  // for QDateTime
-#include <QtCore/QString>    // for QString
-#include <QtCore/QVector>    // for QVector
+#include <QDateTime>         // for QDateTime
+#include <QString>           // for QString
+#include <QVector>           // for QVector
 
 #include "defs.h"
 #include "format.h"

diff --git a/raymarine.cc b/raymarine.cc
index 2ae07a2c30f7f5a9e93d8f18852342199a99834e..75fc6ec7a7cffb52f617de9964fb6e45962c240e 100644 (file)
--- a/raymarine.cc
+++ b/raymarine.cc
@@ -47,7 +47,7 @@
 #include "csv_util.h"
 #include "inifile.h"
 
-#include <QtCore/QString>
+#include <QString>
 #include <cctype>
 #include <cstdio>
 #include <cstdlib>

diff --git a/reverse_route.cc b/reverse_route.cc
index 68ef7f15e2a6b20d5e53ab4705966810af03be11..ebb80d89578a456a1db6e68ba9601cb127910333 100644 (file)
--- a/reverse_route.cc
+++ b/reverse_route.cc
@@ -20,7 +20,7 @@
  */
 #include <algorithm>     // for reverse
 
-#include <QtCore/QList>  // for QList<>::iterator
+#include <QList>         // for QList<>::iterator
 
 #include "defs.h"
 #include "reverse_route.h"

diff --git a/reverse_route.h b/reverse_route.h
index 3ad948d557959eced1bcd73030483b745b33a623..4834c78b8b7a729ec7403068a43066d69b2a7816 100644 (file)
--- a/reverse_route.h
+++ b/reverse_route.h
@@ -21,7 +21,7 @@
 #ifndef REVERSE_ROUTE_H_INCLUDED_
 #define REVERSE_ROUTE_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for Waypoint (ptr only), arglist_t, route_head (ptr ...
 #include "filter.h"  // for Filter

diff --git a/route.cc b/route.cc
index 6beddea0585bf86a8420aeadb9a86e11aa94e5b9..ee03684e7ebe0af5a59d26e4d94dfa9a11bb9a52 100644 (file)
--- a/route.cc
+++ b/route.cc
@@ -23,10 +23,10 @@
 #include <iterator>
 #include <optional>             // for optional, operator>, operator<
 
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QList>         // for QList<>::iterator
-#include <QtCore/QString>       // for QString
-#include <QtCore/QtGlobal>      // for foreach
+#include <QDateTime>            // for QDateTime
+#include <QList>                // for QList<>::iterator
+#include <QString>              // for QString
+#include <QtGlobal>             // for foreach
 
 #include "defs.h"
 #include "grtcirc.h"            // for RAD, gcdist, heading_true_degrees, radtometers

diff --git a/session.cc b/session.cc
index 2ce888832edf2bb59849bd58e57bd3ccb93c684b..8f3efc99635a7b616e7c698a94d12d8fba3fb8b5 100644 (file)
--- a/session.cc
+++ b/session.cc
@@ -22,7 +22,7 @@
 #include "defs.h"
 #include "session.h"
 
-#include <QtCore/QList>  // for QList
+#include <QList>         // for QList
 
 static QList<session_t> session_list;
 

diff --git a/session.h b/session.h
index 006a9f6242226e0ef2f9618b42c4372e1f0a37e5..adc7a17649297966fc4723f975cb944e6a31057e 100644 (file)
--- a/session.h
+++ b/session.h
@@ -22,7 +22,7 @@
 #ifndef SESSION_H_INCLUDED_
 #define SESSION_H_INCLUDED_
 
-#include <QtCore/QString>  // for QString
+#include <QString>         // for QString
 #include <utility>
 
 struct session_t {

diff --git a/shape.cc b/shape.cc
index 1c732153c933504beed686c4b592f3007ff142e6..6a11e022a60dc66aabb83776ee39f893d80842e4 100644 (file)
--- a/shape.cc
+++ b/shape.cc
@@ -22,13 +22,13 @@
 
 #include <cassert>               // for assert
 
-#include <QtCore/QByteArray>     // for QByteArray
-#include <QtCore/QLatin1String>  // for QLatin1String
-#include <QtCore/QString>        // for QString, QString::SkipEmptyParts
-#include <QtCore/QStringList>    // for QStringList
-#include <QtCore/QVector>        // for QVector
-#include <QtCore/Qt>             // for CaseInsensitive
-#include <QtCore/QtGlobal>       // for qPrintable
+#include <QByteArray>            // for QByteArray
+#include <QLatin1String>         // for QLatin1String
+#include <QString>               // for QString, QString::SkipEmptyParts
+#include <QStringList>           // for QStringList
+#include <QVector>               // for QVector
+#include <Qt>                    // for CaseInsensitive
+#include <QtGlobal>              // for qPrintable
 
 #include "defs.h"
 #include "shape.h"

diff --git a/shape.h b/shape.h
index 38c1208c069d95933b534032b28c41b999fd3fc5..4832d7d70646889092cd9c5b410cd2af7d5ea21c 100644 (file)
--- a/shape.h
+++ b/shape.h
@@ -22,8 +22,8 @@
 #ifndef SHAPE_H_INCLUDED_
 #define SHAPE_H_INCLUDED_
 
-#include <QtCore/QString>       // for QString
-#include <QtCore/QVector>       // for QVector
+#include <QString>              // for QString
+#include <QVector>              // for QVector
 
 #include "defs.h"               // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file
 #include "format.h"             // for Format

diff --git a/shortname.cc b/shortname.cc
index 06e829f1e8b5cb831754abbb49f679d7cc101108..f2d27898067f4b9217d277cfe82ca69ad20cb24d 100644 (file)
--- a/shortname.cc
+++ b/shortname.cc
@@ -1,5 +1,5 @@
-#include <QtCore/QString>
-#include <QtCore/QRegexp>
+#include <QString>
+#include <QRegexp>
 
 #include "shortname.h"
 

diff --git a/skytraq.cc b/skytraq.cc
index b0c7b2eda020bd2a1bfb3622e2c23d3126708a97..2a15b97254cf5d2fffa20717884c85284602cc9b 100644 (file)
--- a/skytraq.cc
+++ b/skytraq.cc
@@ -25,7 +25,7 @@
 
 #include "defs.h"
 #include "gbser.h"
-#include <QtCore/QThread>
+#include <QThread>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>

diff --git a/smplrout.cc b/smplrout.cc
index 17203348360d686426097331fdd8df9077ee0428..eb67a2fa5f844c69822c1b53681515f0d31f6959 100644 (file)
--- a/smplrout.cc
+++ b/smplrout.cc
@@ -59,7 +59,7 @@
 #include <cstdlib>              // for qsort, strtol
 #include <utility>              // for swap
 
-#include <QtCore/QDateTime>     // for QDateTime
+#include <QDateTime>            // for QDateTime
 
 #include "defs.h"
 #include "smplrout.h"

diff --git a/smplrout.h b/smplrout.h
index d78a25c9329d9cd35e12b5f56cb5ff1b46c8854b..2386432ca3735f4a6470362a5e4d915140a1c58b 100644 (file)
--- a/smplrout.h
+++ b/smplrout.h
@@ -59,7 +59,7 @@
 #ifndef SMPLROUT_H_INCLUDED_
 #define SMPLROUT_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for route_head (ptr only), Waypoint (ptr only), ARGT...
 #include "filter.h"  // for Filter

diff --git a/sort.cc b/sort.cc
index 417520f175f0a77273ba28514ff9a4e17d0bdb45..f3f182e89a336a1ae05fdd5484e6df96cc173d66 100644 (file)
--- a/sort.cc
+++ b/sort.cc
@@ -19,8 +19,8 @@
 
  */
 
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QString>       // for operator<, QString
+#include <QDateTime>            // for QDateTime
+#include <QString>              // for operator<, QString
 
 #include "defs.h"
 #include "src/core/datetime.h"  // for DateTime
@@ -85,7 +85,7 @@ void SortFilter::process()
       fatal(MYNAME ": unknown waypoint sort mode.");
     }
   }
-  
+
   if (rte_sort_mode != SortModeRteHd::none) {
     switch (rte_sort_mode)  {
     case SortModeRteHd::description:

diff --git a/sort.h b/sort.h
index 79131d9b4734ebb6dae8f6e169f7fa5d2251d9f9..2c4ddf01a18ce9f70352acbfba4efee00e8fd121 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -22,7 +22,7 @@
 #ifndef SORT_H_INCLUDED_
 #define SORT_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, arglist_t, ARG_TERMI...
 #include "filter.h"  // for Filter

diff --git a/src/core/datetime.h b/src/core/datetime.h
index 0c7581b3ab64e818187b99895f44cfecd48963d6..a334043fa04704367d1eb790409af4c3be1b0440 100644 (file)
--- a/src/core/datetime.h
+++ b/src/core/datetime.h
@@ -25,14 +25,14 @@
 
 #include <ctime>
 
-#include <QtCore/QtGlobal>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
+#include <QtGlobal>
+#include <QDateTime>
+#include <QString>
 
 // As this code began in C, we have several hundred places that set and
 // read creation_time as a time_t.  Provide some operator overloads to make
 // that less painful.
-// Probably all of these should eventually go away and be replaced by 
+// Probably all of these should eventually go away and be replaced by
 // "Better" code in the callers.
 
 // Consider putting in a namespace instead of prefixing 'gb'.

diff --git a/src/core/file.h b/src/core/file.h
index ba130a04a7dec777484a5e1dac2e33ef563d525d..47121e75f828450964b6b2f572929f6f6fc5c501 100644 (file)
--- a/src/core/file.h
+++ b/src/core/file.h
@@ -20,10 +20,10 @@
 #ifndef SRC_CORE_FILE_INCLUDED_H_
 #define SRC_CORE_FILE_INCLUDED_H_
 
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QIODevice>
+#include <QFile>
+#include <QFileInfo>
+#include <QStringBuilder>
+#include <QIODevice>
 #include <cstdio>
 #include "src/core/logging.h"
 #include "defs.h"

diff --git a/src/core/logging.h b/src/core/logging.h
index 08480b76201ad52e5bda48a4873c6aa38f9e662a..d020e30934e98307c7e393e3a7fcf0ec41b2fa0b 100644 (file)
--- a/src/core/logging.h
+++ b/src/core/logging.h
@@ -22,8 +22,8 @@
 // A wrapper for QDebug that provides a sensible Warning() and FatalMsg()
 // with convenient functions, stream operators and manipulators.
 
-#include <QtCore/QDebug>     // for QDebug
-#include <QtCore/QtGlobal>   // for QtCriticalMsg, QtWarningMsg
+#include <QDebug>            // for QDebug
+#include <QtGlobal>          // for QtCriticalMsg, QtWarningMsg
 
 
 class Warning : public QDebug
@@ -41,7 +41,7 @@ public:
  *    tools such as cppcheck.
  * 2) allows fatal to throw an exception instead of calling exit.
  *    This could be caught by main for a cleaner exit from a fatal error.
- */ 
+ */
 class FatalMsg : public QDebug
 {
 public:

diff --git a/src/core/optionaldouble.h b/src/core/optionaldouble.h
index 88e0495c706284435235bd31d987c349727c8160..ee9ec60bb8554ba61d53300e0d00ff1c0b1e0771 100644 (file)
--- a/src/core/optionaldouble.h
+++ b/src/core/optionaldouble.h
@@ -27,7 +27,7 @@ STATUS: experimental
 // As this code began in C, we have several hundred places that set and
 // read creation_time as a time_t.  Provide some operator overloads to make
 // that less painful.
-// Probably all of these should eventually go away and be replaced by 
+// Probably all of these should eventually go away and be replaced by
 // "Better" code in the callers.
 
 // Consider putting in a namespace instead of prefixing 'gb'.

diff --git a/src/core/textstream.cc b/src/core/textstream.cc
index 7e646658f227fcaa3a1aa0b38cc551b25105a430..2a9adf5a7b26acc557c0a7f9411bfdbf855ebf4b 100644 (file)
--- a/src/core/textstream.cc
+++ b/src/core/textstream.cc
@@ -17,9 +17,9 @@
 
  */
 
-#include <QtCore/QFile>        // for QFile
-#include <QtCore/QFlags>     // for QFlags
-#include <QtCore/QIODevice>  // for QIODevice, QIODevice::OpenMode, QIODevice::ReadOnly, QIODevice::WriteOnly
+#include <QFile>               // for QFile
+#include <QFlags>            // for QFlags
+#include <QIODevice>         // for QIODevice, QIODevice::OpenMode, QIODevice::ReadOnly, QIODevice::WriteOnly
 
 #include "defs.h"              // for fatal, list_codecs
 #include "src/core/textstream.h"

diff --git a/src/core/textstream.h b/src/core/textstream.h
index 5c1bb1c61354a3892b71c58d0ed663444119a776..a1f1c8fba01aa68ab5b97294de19fcf4404c40d2 100644 (file)
--- a/src/core/textstream.h
+++ b/src/core/textstream.h
@@ -19,10 +19,10 @@
 #ifndef SRC_CORE_TEXTSTREAM_INCLUDED_H_
 #define SRC_CORE_TEXTSTREAM_INCLUDED_H_
 
-#include <QtCore/QIODevice>    // for QIODevice, QIODevice::OpenMode
-#include <QtCore/QString>      // for QString
-#include <QtCore/QTextCodec>   // for QTextCodec
-#include <QtCore/QTextStream>  // for QTextStream
+#include <QIODevice>           // for QIODevice, QIODevice::OpenMode
+#include <QString>             // for QString
+#include <QTextCodec>          // for QTextCodec
+#include <QTextStream>         // for QTextStream
 
 #include "src/core/file.h"     // for File
 

diff --git a/src/core/usasciicodec.cc b/src/core/usasciicodec.cc
index fe04b8d462aaafd2bfe6aa4997c40967dd34dcca..236d7b1c6af27fae6bc9fb2b73c92fef980830f3 100644 (file)
--- a/src/core/usasciicodec.cc
+++ b/src/core/usasciicodec.cc
@@ -18,11 +18,11 @@
  */
 
 #include "src/core/usasciicodec.h"
-#include <QtCore/QByteArray>
-#include <QtCore/QChar>
-#include <QtCore/QLatin1Char>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QChar>
+#include <QLatin1Char>
+#include <QList>
+#include <QString>
 
 // The availability of a US-ASCII codec is not promised by QTextCodec.
 // On Mac OS X is is likely one will not be available.

diff --git a/src/core/usasciicodec.h b/src/core/usasciicodec.h
index a800e3a23985f5dff5375253ac71f93992d66cb1..db002278c95f7f631a112adb93aedb819c400eb6 100644 (file)
--- a/src/core/usasciicodec.h
+++ b/src/core/usasciicodec.h
@@ -20,7 +20,7 @@
 #ifndef QUSASCIICODEC_H
 #define QUSASCIICODEC_H
 
-#include <QtCore/QTextCodec>
+#include <QTextCodec>
 
 namespace gpsbabel
 {

diff --git a/src/core/xmlstreamwriter.cc b/src/core/xmlstreamwriter.cc
index 6f6839ec1ff2acdc053ad4b369c580cf6b2ff232..307dc6ffba6642fee8b9f486fb0a0a3843a92cda 100644 (file)
--- a/src/core/xmlstreamwriter.cc
+++ b/src/core/xmlstreamwriter.cc
@@ -19,9 +19,9 @@
 
 #include "src/core/xmlstreamwriter.h"
 
-#include <QtCore/QString>           // for QString
-#include <QtCore/QXmlStreamWriter>  // for QXmlStreamWriter
-#include <QtCore/QtGlobal>          // for QT_VERSION, QT_VERSION_CHECK
+#include <QString>                  // for QString
+#include <QXmlStreamWriter>         // for QXmlStreamWriter
+#include <QtGlobal>                 // for QT_VERSION, QT_VERSION_CHECK
 
 // As this code began in C, we have several hundred places that write
 // c strings.  Add a test that the string contains anything useful

diff --git a/src/core/xmlstreamwriter.h b/src/core/xmlstreamwriter.h
index a96ed982c36d5ced07e796a83494c6a4ff3fb015..24097da6b8e619bfa4b645d5ffbf1fd2f11cb54a 100644 (file)
--- a/src/core/xmlstreamwriter.h
+++ b/src/core/xmlstreamwriter.h
@@ -20,8 +20,8 @@
 #ifndef XMLSTREAMWRITER_H
 #define XMLSTREAMWRITER_H
 
-#include <QtCore/QString>           // for QString
-#include <QtCore/QXmlStreamWriter>  // for QXmlStreamWriter
+#include <QString>                  // for QString
+#include <QXmlStreamWriter>         // for QXmlStreamWriter
 
 namespace gpsbabel
 {

diff --git a/src/core/xmltag.h b/src/core/xmltag.h
index 7563eba655a76939fb050155e3c6e0d34417a020..6e276a161632b95ac1acae6835e0ddd15ca70572 100644 (file)
--- a/src/core/xmltag.h
+++ b/src/core/xmltag.h
@@ -19,8 +19,8 @@
 #ifndef SRC_CORE_XMLTAG_H
 #define SRC_CORE_XMLTAG_H
 
-#include <QtCore/QString>                          // for QString
-#include <QtCore/QXmlStreamAttributes>             // for QXmlStreamAttributes
+#include <QString>                                 // for QString
+#include <QXmlStreamAttributes>                    // for QXmlStreamAttributes
 
 #include "defs.h"
 

diff --git a/src/core/ziparchive.cc b/src/core/ziparchive.cc
index c742ccb03a324187e63097e33036e708539d2189..ffa98805e8db7432f0ef46cf2dbdf857b268eddc 100644 (file)
--- a/src/core/ziparchive.cc
+++ b/src/core/ziparchive.cc
@@ -29,8 +29,8 @@
 #include "zlib/contrib/minizip/zip.h"
 #endif
 
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
+#include <QFile>
+#include <QDebug>
 
 ZipArchive::ZipArchive(QString filename)
 : filename_(filename), valid_(false) {

diff --git a/src/core/ziparchive.h b/src/core/ziparchive.h
index 9a9d5a813b7dd204c0446106538c99079751bc0f..93fb4c65712a4f6dcf608078b4850153fe089660 100644 (file)
--- a/src/core/ziparchive.h
+++ b/src/core/ziparchive.h
@@ -19,8 +19,8 @@
 
  */
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QString>
+#include <QStringList>
 #include "defs.h"
 #ifdef HAVE_LIBMINIZIP
 #include <minizip/zip.h>

diff --git a/stackfilter.h b/stackfilter.h
index 3d8cdcc466dd6bc4d212fd571227d5c332734fbd..2b2a70ecb8068ce0669af26f9158ca1249a0b995 100644 (file)
--- a/stackfilter.h
+++ b/stackfilter.h
@@ -22,7 +22,7 @@
 #ifndef STACKFILTER_H_INCLUDED_
 #define STACKFILTER_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for ARGTYPE_BOOL, ARG_NOMINMAX, ARGTYPE_BEGIN_EXCL
 #include "filter.h"  // for Filter

diff --git a/stmsdf.cc b/stmsdf.cc
index 3d2ba6f88615e1f70a655047aa0328d590fac746..a7e3e7c1760a82a3a389367af492bd1c8a22378a 100644 (file)
--- a/stmsdf.cc
+++ b/stmsdf.cc
@@ -36,14 +36,14 @@
 #include <cstring>                    // for strchr
 #include <ctime>                      // for localtime, strftime
 
-#include <QtCore/QDate>               // for QDate
-#include <QtCore/QDateTime>           // for QDateTime
-#include <QtCore/QList>               // for QList<>::iterator, QList
-#include <QtCore/QRegularExpression>  // for QRegularExpression
-#include <QtCore/QString>             // for QString, operator+
-#include <QtCore/QStringList>         // for QStringList
-#include <QtCore/QTime>               // for QTime
-#include <QtCore/QtGlobal>            // for qAsConst, QAddConst<>::Type
+#include <QDate>                      // for QDate
+#include <QDateTime>                  // for QDateTime
+#include <QList>                      // for QList<>::iterator, QList
+#include <QRegularExpression>         // for QRegularExpression
+#include <QString>                    // for QString, operator+
+#include <QStringList>                // for QStringList
+#include <QTime>                      // for QTime
+#include <QtGlobal>                   // for qAsConst, QAddConst<>::Type
 
 #include "cet_util.h"                 // for cet_convert_init
 #include "csv_util.h"                 // for csv_lineparse

diff --git a/stmwpp.cc b/stmwpp.cc
index b7e130f724bf9a0f03adf3d0d41afda57e9abcef..f1e962fbca79f0ac423b35e8357af0539d646076 100644 (file)
--- a/stmwpp.cc
+++ b/stmwpp.cc
@@ -25,10 +25,10 @@
 #include <cstring>                 // for memset
 #include <ctime>                   // for tm
 
-#include <QtCore/QDateTime>        // for QDateTime
-#include <QtCore/QString>          // for QString
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/QVector>          // for QVector
+#include <QDateTime>               // for QDateTime
+#include <QString>                 // for QString
+#include <QTime>                   // for QTime
+#include <QVector>                 // for QVector
 
 #include "defs.h"
 #include "cet_util.h"              // for cet_convert_init

diff --git a/subrip.cc b/subrip.cc
index 707f7c1bc9ab5761a01a7a387736a09081a3b43d..3ced5b26dc16c130583fd524116a88f34ee6b482 100644 (file)
--- a/subrip.cc
+++ b/subrip.cc
@@ -19,12 +19,12 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
  */
-#include <QtCore/QDate>         // for QDate
-#include <QtCore/QDateTime>     // for QDateTime, operator<<
-#include <QtCore/QDebug>        // for QDebug
-#include <QtCore/QString>       // for QString
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/Qt>            // for UTC
+#include <QDate>                // for QDate
+#include <QDateTime>            // for QDateTime, operator<<
+#include <QDebug>               // for QDebug
+#include <QString>              // for QString
+#include <QTime>                // for QTime
+#include <Qt>                   // for UTC
 
 #include "defs.h"
 #include "subrip.h"

diff --git a/subrip.h b/subrip.h
index 15befa49729de5ae001057329dda6c1469098e04..e54ebee99daf5aed78676291af39cde905f26333 100644 (file)
--- a/subrip.h
+++ b/subrip.h
@@ -22,10 +22,10 @@
 #ifndef SUBRIP_H_INCLUDED_
 #define SUBRIP_H_INCLUDED_
 
-#include <QtCore/QDateTime>  // for QDateTime, operator<<
-#include <QtCore/QString>    // for QString
-#include <QtCore/QTime>      // for QTime
-#include <QtCore/QVector>    // for QVector
+#include <QDateTime>         // for QDateTime, operator<<
+#include <QString>           // for QString
+#include <QTime>             // for QTime
+#include <QVector>           // for QVector
 
 #include "defs.h"
 #include "format.h"          // for Format

diff --git a/swapdata.h b/swapdata.h
index 498dbdc5123205a124fe66746839033b879d6c53..58dd9e99a7e89aa912627bdec477cf65479dd65a 100644 (file)
--- a/swapdata.h
+++ b/swapdata.h
@@ -23,7 +23,7 @@
 #ifndef SWAPDATA_H_INCLUDED_
 #define SWAPDATA_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for arglist_t, Waypoint
 #include "filter.h"  // for Filter

diff --git a/tef_xml.cc b/tef_xml.cc
index 34a10ad43d5b74a38ca8c153458c8b752be69ff1..e6a9d5d54c6158b761792825ab43a30cdc8ce1b5 100644 (file)
--- a/tef_xml.cc
+++ b/tef_xml.cc
@@ -23,13 +23,13 @@
 
 */
 
-#include <QtCore/QLatin1String>         // for QLatin1String
-#include <QtCore/QString>               // for QString
-#include <QtCore/QStringView>           // for QStringView
-#include <QtCore/QVector>               // for QVector
-#include <QtCore/QXmlStreamAttribute>   // for QXmlStreamAttribute
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/Qt>                    // for CaseInsensitive
+#include <QLatin1String>                // for QLatin1String
+#include <QString>                      // for QString
+#include <QStringView>                  // for QStringView
+#include <QVector>                      // for QVector
+#include <QXmlStreamAttribute>          // for QXmlStreamAttribute
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <Qt>                           // for CaseInsensitive
 
 #include "defs.h"
 #include "xmlgeneric.h"                 // for cb_start, cb_end, xg_callback, xg_string, xg_cb_type, xml_deinit, xml_init, xml_read, xg_tag_mapping
@@ -121,7 +121,7 @@ tef_list_start(xg_string, const QXmlStreamAttributes* attrv)
 
 /*
  * TODO: this whole horrible mess is not covered at all in the test suite,
- * so just stub it all out until someone cares. (TEF is rarely used from 
+ * so just stub it all out until someone cares. (TEF is rarely used from
  * what we can tell.)
  */
 
@@ -184,7 +184,7 @@ Xfix_notes(const QString& name, const QString& notes)
   return r;
 }
 #else
-static QString 
+static QString
 fix_notes(const QString&, const QString& notes){
     return notes;
 }

diff --git a/text.cc b/text.cc
index bc1aa866a4956f395869ec213cdb0b9b7e1ef8a6..143b037f6f960014b19c13678e2a0836b9dff275 100644 (file)
--- a/text.cc
+++ b/text.cc
@@ -22,9 +22,9 @@
 #include <cstdint>
 #include <ctime>                   // for localtime
 
-#include <QtCore/QString>          // for QString, operator!=
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
+#include <QString>                 // for QString, operator!=
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
 
 #include "defs.h"
 #include "formspec.h"              // for FsChainFind, kFsGpx

diff --git a/tomtom.cc b/tomtom.cc
index 9d04f1461baaf74fb81f9fdcc1937eb8d9a2f066..d72ad4a2b7a16e83f1c57ed5dd9f3aff31a1af2e 100644 (file)
--- a/tomtom.cc
+++ b/tomtom.cc
@@ -41,8 +41,8 @@
 #include <cstdlib>          // for qsort
 #include <cstring>          // for strlen
 
-#include <QtCore/QString>   // for QString
-#include <QtCore/QtGlobal>  // for foreach
+#include <QString>          // for QString
+#include <QtGlobal>         // for foreach
 
 #include "defs.h"
 #include "gbfile.h"         // for gbfgetint32, gbfputint32, gbfclose, gbfgetc, gbfputc, gbfseek, gbfile, gbfeof, gbfread, gbftell, gbfwrite, gbfopen_le

diff --git a/tpo.cc b/tpo.cc
index 76370912449f24244296a2f4c5e9956095b7017d..6dc26b64e1f972ee13c59c07bf7b6fb088656466 100644 (file)
--- a/tpo.cc
+++ b/tpo.cc
@@ -77,12 +77,12 @@
 #include <cstring>                     // for strncmp, strlen, memset
 #include <vector>                      // for vector
 
-#include <QtCore/QByteArray>           // for QByteArray
-#include <QtCore/QChar>                // for operator==, QChar
-#include <QtCore/QCharRef>             // for QCharRef
-#include <QtCore/QScopedArrayPointer>  // for QScopedArrayPointer
-#include <QtCore/QString>              // for QString
-#include <QtCore/QtGlobal>             // for qPrintable, Q_UNUSED
+#include <QByteArray>                  // for QByteArray
+#include <QChar>                       // for operator==, QChar
+#include <QCharRef>                    // for QCharRef
+#include <QScopedArrayPointer>         // for QScopedArrayPointer
+#include <QString>                     // for QString
+#include <QtGlobal>                    // for qPrintable, Q_UNUSED
 
 #include "defs.h"
 #include "gbfile.h"                    // for gbfread, gbfgetc, gbfgetint32, gbfwrite, gbfputint16, gbfseek, gbfgetdbl, gbfgetint16, gbfputdbl, gbfclose, gbfputint32, gbfile, gbfopen_le, gbfgetuint16
@@ -644,13 +644,13 @@ static void tpo_process_tracks()
     track_temp->line_width = styles[track_style].wide;
 
     if (DEBUG) printf("Track Name: %s, ?Type?: %u, Style Name: %s, Width: %d, Dashed: %d, Color: #%s\n",
-                        qPrintable(track_name), line_type, 
+                        qPrintable(track_name), line_type,
                         qPrintable(styles[track_style].name),
                         styles[track_style].wide,
                         styles[track_style].dash,rgb);
 
     // Track description
-    track_temp->rte_desc = 
+    track_temp->rte_desc =
       QString("Style=%1, Width=%2, Dashed=%3, Color=#%4")
                          .arg(styles[track_style].name)
                          .arg(styles[track_style].wide)

diff --git a/trackfilter.cc b/trackfilter.cc
index 3433e0cbc7fc61b21496c8b42b091542fdb76e5a..6d2ab94af52c7e7431aa8f28494aa9928b36731e 100644 (file)
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -32,20 +32,20 @@
 
 #include <algorithm>                       // for sort, stable_sort
 
-#include <QtCore/QByteArray>               // for QByteArray
-#include <QtCore/QChar>                    // for QChar
-#include <QtCore/QDate>                    // for QDate
-#include <QtCore/QDateTime>                // for QDateTime
+#include <QByteArray>                      // for QByteArray
+#include <QChar>                           // for QChar
+#include <QDate>                           // for QDate
+#include <QDateTime>                       // for QDateTime
 #ifdef TRACKF_DBG
-#include <QtCore/QDebug>
+#include <QDebug>
 #endif
-#include <QtCore/QList>                    // for QList<>::iterator, QList, QList<>::const_iterator
-#include <QtCore/QRegExp>                  // for QRegExp, QRegExp::WildcardUnix
-#include <QtCore/QRegularExpression>       // for QRegularExpression, QRegularExpression::CaseInsensitiveOption, QRegularExpression::PatternOptions
-#include <QtCore/QRegularExpressionMatch>  // for QRegularExpressionMatch
-#include <QtCore/QString>                  // for QString
-#include <QtCore/Qt>                       // for UTC, CaseInsensitive
-#include <QtCore/QtGlobal>                 // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64
+#include <QList>                           // for QList<>::iterator, QList, QList<>::const_iterator
+#include <QRegExp>                         // for QRegExp, QRegExp::WildcardUnix
+#include <QRegularExpression>              // for QRegularExpression, QRegularExpression::CaseInsensitiveOption, QRegularExpression::PatternOptions
+#include <QRegularExpressionMatch>         // for QRegularExpressionMatch
+#include <QString>                         // for QString
+#include <Qt>                              // for UTC, CaseInsensitive
+#include <QtGlobal>                        // for qAsConst, foreach, qPrintable, QAddConst<>::Type, qint64
 
 #include "defs.h"
 #include "trackfilter.h"

diff --git a/trackfilter.h b/trackfilter.h
index 5ecc9de398f688e775d264d68d9113f273ea001e..721f02d9fd7df304699630a0b7da92c8b3e97a24 100644 (file)
--- a/trackfilter.h
+++ b/trackfilter.h
@@ -22,10 +22,10 @@
 #ifndef TRACKFILTER_H_INCLUDED_
 #define TRACKFILTER_H_INCLUDED_
 
-#include <QtCore/QDateTime>  // for QDateTime
-#include <QtCore/QList>      // for QList
-#include <QtCore/QVector>    // for QVector
-#include <QtCore/QtGlobal>   // for qint64
+#include <QDateTime>         // for QDateTime
+#include <QList>             // for QList
+#include <QVector>           // for QVector
+#include <QtGlobal>          // for qint64
 
 #include "defs.h"            // for ARG_NOMINMAX, route_head (ptr only), ARG...
 #include "filter.h"          // for Filter

diff --git a/transform.cc b/transform.cc
index e53ddb7f10a91575f1c4ad471be3e4d978714c45..93a78aece49b30173132324ca853fe705ad5d47b 100644 (file)
--- a/transform.cc
+++ b/transform.cc
@@ -23,7 +23,7 @@
 #include <cctype>           // for toupper
 #include <cstdlib>          // for atoi
 
-#include <QtCore/QtGlobal>  // for foreach
+#include <QtGlobal>         // for foreach
 
 #include "defs.h"
 #include "transform.h"

diff --git a/transform.h b/transform.h
index 34c12efde37845cb5b88c1dbabaf09410e9a7b62..717d0f00494f886a5c2686dccb1c414a5b5b75ca 100644 (file)
--- a/transform.h
+++ b/transform.h
@@ -23,8 +23,8 @@
 #ifndef TRANSFORM_H_INCLUDED_
 #define TRANSFORM_H_INCLUDED_
 
-#include <QtCore/QString>  // for QString
-#include <QtCore/QVector>  // for QVector
+#include <QString>         // for QString
+#include <QVector>         // for QVector
 
 #include "defs.h"          // for route_head (ptr only), ARG_NOMINMAX, ARGTY...
 #include "filter.h"        // for Filter

diff --git a/unicsv.cc b/unicsv.cc
index 19d25b097b727f364ef4b3b0194cfa40c28b727f..a55c9fc1a6a6862d3147d99ce8380fd3797a7b42 100644 (file)
--- a/unicsv.cc
+++ b/unicsv.cc
@@ -26,20 +26,20 @@
 #include <cstring>                 // for memset, strchr, strncpy
 #include <ctime>                   // for gmtime
 
-#include <QtCore/QByteArray>       // for QByteArray
-#include <QtCore/QChar>            // for QChar
-#include <QtCore/QCharRef>         // for QCharRef
-#include <QtCore/QDateTime>        // for QDateTime
-#include <QtCore/QIODevice>        // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly
-#include <QtCore/QLatin1Char>      // for QLatin1Char
-#include <QtCore/QLatin1String>    // for QLatin1String
-#include <QtCore/QString>          // for QString, operator!=, operator==
-#include <QtCore/QStringList>      // for QStringList
-#include <QtCore/QTextStream>      // for QTextStream, operator<<, qSetRealNumberPrecision, qSetFieldWidth, QTextStream::FixedNotation
-#include <QtCore/QTime>            // for QTime
-#include <QtCore/QVector>          // for QVector
-#include <QtCore/Qt>               // for CaseInsensitive
-#include <QtCore/QtGlobal>         // for qPrintable
+#include <QByteArray>              // for QByteArray
+#include <QChar>                   // for QChar
+#include <QCharRef>                // for QCharRef
+#include <QDateTime>               // for QDateTime
+#include <QIODevice>               // for QIODevice, QIODevice::ReadOnly, QIODevice::WriteOnly
+#include <QLatin1Char>             // for QLatin1Char
+#include <QLatin1String>           // for QLatin1String
+#include <QString>                 // for QString, operator!=, operator==
+#include <QStringList>             // for QStringList
+#include <QTextStream>             // for QTextStream, operator<<, qSetRealNumberPrecision, qSetFieldWidth, QTextStream::FixedNotation
+#include <QTime>                   // for QTime
+#include <QVector>                 // for QVector
+#include <Qt>                      // for CaseInsensitive
+#include <QtGlobal>                // for qPrintable
 
 #include "defs.h"
 #include "unicsv.h"

diff --git a/unicsv.h b/unicsv.h
index b6151eb0af6aa45509564000494d79e2d7012d08..1a0e249d8066bb35146a85be1de8c4485ff9b3bf 100644 (file)
--- a/unicsv.h
+++ b/unicsv.h
@@ -24,9 +24,9 @@
 #include <cstdint>
 #include <ctime>                  // for gmtime
 
-#include <QtCore/QDateTime>       // for QDateTime
-#include <QtCore/QString>         // for QString, operator!=, operator==
-#include <QtCore/QVector>         // for QVector
+#include <QDateTime>              // for QDateTime
+#include <QString>                // for QString, operator!=, operator==
+#include <QVector>                // for QVector
 
 #include "defs.h"
 #include "format.h"               // for Format

diff --git a/util.cc b/util.cc
index 611bb8d960152f48b68b965cc8c6703472d4a76d..2efb0b5c439e25150da079edb16383f1db8f3315 100644 (file)
--- a/util.cc
+++ b/util.cc
@@ -30,21 +30,21 @@
 #include <cstring>                      // for strlen, strcat, strstr, memcpy, strcmp, strcpy, strdup, strchr, strerror
 #include <ctime>                        // for mktime, localtime
 
-#include <QtCore/QByteArray>            // for QByteArray
-#include <QtCore/QChar>                 // for QChar, operator<=, operator>=
-#include <QtCore/QCharRef>              // for QCharRef
-#include <QtCore/QDateTime>             // for QDateTime
-#include <QtCore/QFileInfo>             // for QFileInfo
-#include <QtCore/QList>                 // for QList
-#include <QtCore/QScopedPointer>        // for QScopedPointer
-#include <QtCore/QString>               // for QString
-#include <QtCore/QTextCodec>            // for QTextCodec
-#include <QtCore/QTextStream>           // for operator<<, QTextStream, qSetFieldWidth, endl, QTextStream::AlignLeft
-#include <QtCore/QXmlStreamAttribute>   // for QXmlStreamAttribute
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/Qt>                    // for CaseInsensitive
-#include <QtCore/QTimeZone>             // for QTimeZone
-#include <QtCore/QtGlobal>              // for qAsConst, QAddConst<>::Type, qPrintable
+#include <QByteArray>                   // for QByteArray
+#include <QChar>                        // for QChar, operator<=, operator>=
+#include <QCharRef>                     // for QCharRef
+#include <QDateTime>                    // for QDateTime
+#include <QFileInfo>                    // for QFileInfo
+#include <QList>                        // for QList
+#include <QScopedPointer>               // for QScopedPointer
+#include <QString>                      // for QString
+#include <QTextCodec>                   // for QTextCodec
+#include <QTextStream>                  // for operator<<, QTextStream, qSetFieldWidth, endl, QTextStream::AlignLeft
+#include <QXmlStreamAttribute>          // for QXmlStreamAttribute
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <Qt>                           // for CaseInsensitive
+#include <QTimeZone>                    // for QTimeZone
+#include <QtGlobal>                     // for qAsConst, QAddConst<>::Type, qPrintable
 
 #include "defs.h"
 #include "cet.h"                        // for cet_utf8_to_ucs4

diff --git a/v900.cc b/v900.cc
index 18f3a1f320076c0cfe2254852242f1769095c6ae..b8e5d6c00922fbed1ba3ac8efaf1721c0fe7fc1d 100644 (file)
--- a/v900.cc
+++ b/v900.cc
@@ -191,10 +191,10 @@ bintime2utc(int date, int time) {
   int day = date % 100;
   date /= 100;
   int month = date % 100;
-  date /= 100; 
+  date /= 100;
   // What's left in 'date' is year.
   QDate dt(date + 2000, month, day);
-  
+
   return QDateTime(dt, tm, Qt::UTC);
 }
 

diff --git a/validate.h b/validate.h
index e8fbfedc3e3c066b2352e0d68496b4958abe0a3b..ad47720fb06edd8889c6d81536aa99c71c696379 100644 (file)
--- a/validate.h
+++ b/validate.h
@@ -23,7 +23,7 @@
 #ifndef VALIDATE_H_INCLUDED_
 #define VALIDATE_H_INCLUDED_
 
-#include <QtCore/QVector>  // for QVector
+#include <QVector>         // for QVector
 
 #include "defs.h"    // for route_head (ptr only), ARGTYPE_BOOL, ARG_NOMINMAX
 #include "filter.h"  // for Filter

diff --git a/vecs.cc b/vecs.cc
index 1a91991c7170dbb2b6687d94d8ace61e018f21f5..b050ef03f417ffb44be1aefc8b8907b10d64085b 100644 (file)
--- a/vecs.cc
+++ b/vecs.cc
@@ -19,12 +19,12 @@
 
  */
 
-#include <QtCore/QByteArray>    // for QByteArray
-#include <QtCore/QString>       // for QString
-#include <QtCore/QStringList>   // for QStringList
-#include <QtCore/QVector>       // for QVector<>::iterator, QVector
-#include <QtCore/Qt>            // for CaseInsensitive
-#include <QtCore/QtGlobal>      // for qPrintable
+#include <QByteArray>           // for QByteArray
+#include <QString>              // for QString
+#include <QStringList>          // for QStringList
+#include <QVector>              // for QVector<>::iterator, QVector
+#include <Qt>                   // for CaseInsensitive
+#include <QtGlobal>             // for qPrintable
 
 #include <algorithm>            // for sort
 #include <cassert>              // for assert

diff --git a/vecs.h b/vecs.h
index 8caeadde79a62d3f037d7302d761de0895f6d25f..67eaed96b058d340508ceb08c91ede41e851c9ca 100644 (file)
--- a/vecs.h
+++ b/vecs.h
@@ -23,9 +23,9 @@
 
 #include <cstdint>
 
-#include <QtCore/QString>       // for QString
-#include <QtCore/QStringList>   // for QStringList
-#include <QtCore/QVector>       // for QVector<>::iterator, QVector
+#include <QString>              // for QString
+#include <QStringList>          // for QStringList
+#include <QVector>              // for QVector<>::iterator, QVector
 
 #include "defs.h"
 #include "dg-100.h"

diff --git a/waypt.cc b/waypt.cc
index e8f72709a1da87dc34ddbff4c58b28879f18c8b9..59c518dc8be467ed929d0368a3772334960ee16a 100644 (file)
--- a/waypt.cc
+++ b/waypt.cc
@@ -24,12 +24,12 @@
 #include <cstdio>               // for printf, fflush, fprintf, stdout
 #include <algorithm>            // for stable_sort
 
-#include <QtCore/QChar>         // for QChar
-#include <QtCore/QDateTime>     // for QDateTime
-#include <QtCore/QList>         // for QList
-#include <QtCore/QString>       // for QString, operator==
-#include <QtCore/QTime>         // for QTime
-#include <QtCore/QtGlobal>      // for qPrintable
+#include <QChar>                // for QChar
+#include <QDateTime>            // for QDateTime
+#include <QList>                // for QList
+#include <QString>              // for QString, operator==
+#include <QTime>                // for QTime
+#include <QtGlobal>             // for qPrintable
 
 #include "defs.h"
 #include "garmin_fs.h"          // for garmin_ilink_t, garmin_fs_t, GMSD_FIND

diff --git a/wfff_xml.cc b/wfff_xml.cc
index 44428c0f97d10a1876102ce22180dce15f6342c0..3f082d77834663d182c352498fd48638e6e967c0 100644 (file)
--- a/wfff_xml.cc
+++ b/wfff_xml.cc
@@ -19,7 +19,7 @@
 
 #include "defs.h"
 #include "xmlgeneric.h"
-#include <QtCore/QXmlStreamAttributes>
+#include <QXmlStreamAttributes>
 #include <cstdio>
 
 /* argument storage */
@@ -107,8 +107,8 @@ void wfff_s(xg_string, const QXmlStreamAttributes*)
   ap_lon=0.0;
 }
 
-void wfff_mac(const QString& args, const QXmlStreamAttributes*) { 
-  ap_mac = args; 
+void wfff_mac(const QString& args, const QXmlStreamAttributes*) {
+  ap_mac = args;
 }
 void wfff_ssid(const QString& args, const QXmlStreamAttributes*) {
   ap_ssid = args;

diff --git a/xcsv.cc b/xcsv.cc
index 7e5a6009dbba857aa64853204b6c44762fcd113a..5e413ea791b881b06f4b15c53c485f6bc3634cd6 100644 (file)
--- a/xcsv.cc
+++ b/xcsv.cc
@@ -32,19 +32,19 @@
 #include <ctime>                      // for gmtime, localtime, time_t, mktime, strftime
 #include <optional>                   // for optional
 
-#include <QtCore/QByteArray>          // for QByteArray
-#include <QtCore/QChar>               // for QChar
-#include <QtCore/QDate>               // for QDate
-#include <QtCore/QDateTime>           // for QDateTime
-#include <QtCore/QDebug>              // for QDebug
-#include <QtCore/QHash>               // for QHash
-#include <QtCore/QIODevice>           // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly
-#include <QtCore/QList>               // for QList
-#include <QtCore/QRegularExpression>  // for QRegularExpression
-#include <QtCore/QString>             // for QString, operator+, operator==
-#include <QtCore/QStringList>         // for QStringList
-#include <QtCore/QTextStream>         // for QTextStream
-#include <QtCore/QtGlobal>            // for qAsConst, qPrintable
+#include <QByteArray>                 // for QByteArray
+#include <QChar>                      // for QChar
+#include <QDate>                      // for QDate
+#include <QDateTime>                  // for QDateTime
+#include <QDebug>                     // for QDebug
+#include <QHash>                      // for QHash
+#include <QIODevice>                  // for QIODevice, operator|, QIODevice::ReadOnly, QIODevice::Text, QIODevice::WriteOnly
+#include <QList>                      // for QList
+#include <QRegularExpression>         // for QRegularExpression
+#include <QString>                    // for QString, operator+, operator==
+#include <QStringList>                // for QStringList
+#include <QTextStream>                // for QTextStream
+#include <QtGlobal>                   // for qAsConst, qPrintable
 
 #include "defs.h"
 #include "csv_util.h"                 // for csv_stringtrim, dec_to_human, csv_stringclean, human_to_dec, ddmmdir_to_degrees, dec_to_intdeg, decdir_to_dec, intdeg_to_dec, csv_linesplit

diff --git a/xcsv.h b/xcsv.h
index 2b43010ae3954512e728547aa35d7e6b4726da5b..cc07b9fada983215ad8ee408229a786091fce1ac 100644 (file)
--- a/xcsv.h
+++ b/xcsv.h
@@ -25,13 +25,13 @@
 #include <optional>               // for optional
 #include <utility>                // for move
 
-#include <QtCore/QByteArray>      // for QByteArray
-#include <QtCore/QDateTime>       // for QDateTime
-#include <QtCore/QHash>           // for QHash
-#include <QtCore/QList>           // for QList
-#include <QtCore/QString>         // for QString
-#include <QtCore/QStringList>     // for QStringList
-#include <QtCore/QVector>         // for QVector
+#include <QByteArray>             // for QByteArray
+#include <QDateTime>              // for QDateTime
+#include <QHash>                  // for QHash
+#include <QList>                  // for QList
+#include <QString>                // for QString
+#include <QStringList>            // for QStringList
+#include <QVector>                // for QVector
 
 #include "defs.h"
 #include "format.h"

diff --git a/xmlgeneric.cc b/xmlgeneric.cc
index 7bf166a378356bd527ec6e845352403da9739775..540b1f474d70d415ada9dba3036d05af431d0400 100644 (file)
--- a/xmlgeneric.cc
+++ b/xmlgeneric.cc
@@ -19,16 +19,16 @@
 
  */
 
-#include <QtCore/QByteArray>            // for QByteArray
-#include <QtCore/QHash>                 // for QHash
-#include <QtCore/QIODevice>             // for QIODevice, QIODevice::ReadOnly
-#include <QtCore/QLatin1Char>           // for QLatin1Char
-#include <QtCore/QList>
-#include <QtCore/QStringView>           // for QStringView
-#include <QtCore/QTextCodec>            // for QTextCodec
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
-#include <QtCore/QXmlStreamReader>      // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndElement, QXmlStreamReader::IncludeChildElements, QXmlStreamReader::StartDocument, QXmlStreamReader::StartElement
-#include <QtCore/QtGlobal>              // for qPrintable
+#include <QByteArray>                   // for QByteArray
+#include <QHash>                        // for QHash
+#include <QIODevice>                    // for QIODevice, QIODevice::ReadOnly
+#include <QLatin1Char>                  // for QLatin1Char
+#include <QList>
+#include <QStringView>                  // for QStringView
+#include <QTextCodec>                   // for QTextCodec
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <QXmlStreamReader>             // for QXmlStreamReader, QXmlStreamReader::Characters, QXmlStreamReader::EndElement, QXmlStreamReader::IncludeChildElements, QXmlStreamReader::StartDocument, QXmlStreamReader::StartElement
+#include <QtGlobal>                     // for qPrintable
 
 #include "defs.h"
 #include "xmlgeneric.h"
@@ -36,7 +36,7 @@
 
 #define DEBUG_TAG 0
 #if DEBUG_TAG
-#include <QtCore/QDebug>
+#include <QDebug>
 #endif
 
 enum xg_shortcut {

diff --git a/xmlgeneric.h b/xmlgeneric.h
index c4e14dfe25e19d9b28a438d5f42254ff292ecc80..18580108e8dc6fa00e9e2eb5b1100a45ba742867 100644 (file)
--- a/xmlgeneric.h
+++ b/xmlgeneric.h
@@ -22,8 +22,8 @@
 #ifndef XMLGENERIC_H_INCLUDED_
 #define XMLGENERIC_H_INCLUDED_
 
-#include <QtCore/QString>               // for QString
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QString>                      // for QString
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 // Maybe the XmlGeneric string callback really shouldn't have a type
 // of its own; this was a crutch during the move from char* to QString.
@@ -81,7 +81,7 @@ private:
 };
 
 // xml processing uses a QList<xg_tag_map_entry>.
-// You may generated this yourself.  See method 1 below. 
+// You may generated this yourself.  See method 1 below.
 // Or it may be generated for you using one of the subsequent
 // methods.
 struct xg_tag_map_entry {
@@ -147,7 +147,7 @@ QList<xg_tag_map_entry>* build_xg_tag_map(MyFormat* instance, const QList<my_fun
  *    You must set the dynamic_tbl parameter to true to free the generated table
  *    resources when xml_deinit is called.
  *
- */ 
+ */
 void xml_init(const QString& fname, QList<xg_tag_map_entry>* tbl, const char* encoding,
               const char** ignorelist = nullptr,
               const char** skiplist = nullptr, bool dynamic_tbl = false);

diff --git a/xmltag.cc b/xmltag.cc
index da2f71d9b5f08bdc01ec90c58156135185ed7b5b..d01594d56d6dce43d177a1959e2c8e69b1749a74 100644 (file)
--- a/xmltag.cc
+++ b/xmltag.cc
@@ -19,8 +19,8 @@
 
  */
 
-#include <QtCore/QString>               // for QString
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QString>                      // for QString
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "src/core/xmltag.h"

diff --git a/xol.cc b/xol.cc
index 6b2569f18686a8b6cedada0260f53980e329060b..474a8f87f5b21b71c384c3ec97adb44b1630419e 100644 (file)
--- a/xol.cc
+++ b/xol.cc
@@ -27,8 +27,8 @@
 #include "src/core/xmlstreamwriter.h"
 #include "xmlgeneric.h"
 
-#include <QtCore/QXmlStreamAttributes>
-#include <QtCore/QXmlStreamWriter>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamWriter>
 
 static Waypoint* wpt_;
 static route_head* trk_;

diff --git a/yahoo.cc b/yahoo.cc
index 21c5200560bcb758b507a3f42c4b04bd1f75c600..8b02367a747b7acfb35d4ab48b652a6f554b221e 100644 (file)
--- a/yahoo.cc
+++ b/yahoo.cc
@@ -20,7 +20,7 @@
  */
 
 
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "yahoo.h"

diff --git a/yahoo.h b/yahoo.h
index f3bf2dd9d5741a14dffc26d15cde9c327de7e27a..bc0e3554a472c0d4cf34c2d23d678ef626d3a0af 100644 (file)
--- a/yahoo.h
+++ b/yahoo.h
@@ -21,10 +21,10 @@
 #ifndef YAHOO_H_INCLUDED_
 #define YAHOO_H_INCLUDED_
 
-#include <QtCore/QList>                 // for QList
-#include <QtCore/QString>               // for QString
-#include <QtCore/QVector>               // for QVector
-#include <QtCore/QXmlStreamAttributes>  // for QXmlStreamAttributes
+#include <QList>                        // for QList
+#include <QString>                      // for QString
+#include <QVector>                      // for QVector
+#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "format.h"                     // for Format